projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d773c66)
[PATCH] m68knommu: fix dma-mapping.h
authorGreg Ungerer <gerg@snapgear.com>
Mon, 4 Dec 2006 07:27:58 +0000 (17:27 +1000)
committerLinus Torvalds <torvalds@woody.osdl.org>
Mon, 4 Dec 2006 16:28:47 +0000 (08:28 -0800)
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>
include/asm-m68knommu/dma-mapping.h patch | blob | blame | history

diff --git a/include/asm-m68knommu/dma-mapping.h b/include/asm-m68knommu/dma-mapping.h
index 5622b855a577ed190918e6b5206230991def7dbe..6aeab18e58bd16631dbc4c2d6caa6f3c156b9a5a 100644 (file)
--- 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 */
Motorola kernel-slsi