From: Greg Ungerer <gerg@snapgear.com>
Date: Mon, 4 Dec 2006 07:27:58 +0000 (+1000)
Subject: [PATCH] m68knommu: fix dma-mapping.h
X-Git-Tag: v2.6.20-rc2~6^2~13^2~22
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=04a9f081b76f536bcf69db066153c2a4231d5783;p=linux-2.6-omap-h63xx.git

[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>
---

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 */