diff --git a/[refs] b/[refs]
index f919d9f387a2..6612e003e3af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d773c660973560970a6b3697cb280ddc5389447d
+refs/heads/master: 04a9f081b76f536bcf69db066153c2a4231d5783
diff --git a/trunk/include/asm-m68knommu/dma-mapping.h b/trunk/include/asm-m68knommu/dma-mapping.h
index 5622b855a577..6aeab18e58bd 100644
--- a/trunk/include/asm-m68knommu/dma-mapping.h
+++ b/trunk/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 */