Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville...

[linux-2.6-omap-h63xx.git] / include / asm-m68knommu / dma-mapping.h

diff --git a/include/asm-m68knommu/dma-mapping.h b/include/asm-m68knommu/dma-mapping.h
index a6c42ba48da6afdf74092a4a8dee652443f559d1..6aeab18e58bd16631dbc4c2d6caa6f3c156b9a5a 100644 (file)
--- a/include/asm-m68knommu/dma-mapping.h
+++ b/include/asm-m68knommu/dma-mapping.h
@@ -1,10 +1,10 @@
 #ifndef _M68KNOMMU_DMA_MAPPING_H
 #define _M68KNOMMU_DMA_MAPPING_H
 
-#include <linux/config.h>
-
 #ifdef CONFIG_PCI
 #include <asm-generic/dma-mapping.h>
+#else
+#include <asm-generic/dma-mapping-broken.h>
 #endif
 
 #endif  /* _M68KNOMMU_DMA_MAPPING_H */