summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2006-12-04 17:27:58 +1000
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-04 08:28:47 -0800
commit04a9f081b76f536bcf69db066153c2a4231d5783 (patch)
tree5e2cb177794bd89863b94147f1817df4d6e0dc02
parentd773c660973560970a6b3697cb280ddc5389447d (diff)
[PATCH] m68knommu: fix dma-mapping.h
Make the m68knommu DMA handling consistent with other architectures. Compile problems pointed out by Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/asm-m68knommu/dma-mapping.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-m68knommu/dma-mapping.h b/include/asm-m68knommu/dma-mapping.h
index 5622b855a57..6aeab18e58b 100644
--- a/include/asm-m68knommu/dma-mapping.h
+++ b/include/asm-m68knommu/dma-mapping.h
@@ -1,9 +1,10 @@
#ifndef _M68KNOMMU_DMA_MAPPING_H
#define _M68KNOMMU_DMA_MAPPING_H
-
#ifdef CONFIG_PCI
#include <asm-generic/dma-mapping.h>
+#else
+#include <asm-generic/dma-mapping-broken.h>
#endif
#endif /* _M68KNOMMU_DMA_MAPPING_H */