summaryrefslogtreecommitdiff
path: root/arch/ia64/include
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2011-03-16 09:57:50 -0700
committerTony Luck <tony.luck@intel.com>2011-03-16 09:57:50 -0700
commit4897313a62cf0b106e9e861bf7350a9cfc0715d0 (patch)
tree0f43932bbc8aa2e0f96af2d1896f54d9de131a51 /arch/ia64/include
parent521cb40b0c44418a4fd36dc633f575813d59a43d (diff)
parentb4a6b3436531f6c5256e6d60d388c3c28ff1a0e9 (diff)
Pull misc-2.6.39 into release branch
Diffstat (limited to 'arch/ia64/include')
-rw-r--r--arch/ia64/include/asm/dma-mapping.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
index a2e7368a0150..4336d080b241 100644
--- a/arch/ia64/include/asm/dma-mapping.h
+++ b/arch/ia64/include/asm/dma-mapping.h
@@ -12,6 +12,8 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
+#define DMA_ERROR_CODE 0
+
extern struct dma_map_ops *dma_ops;
extern struct ia64_machine_vector ia64_mv;
extern void set_iommu_machvec(void);