---

yaml --- r: 139955 b: refs/heads/master c: 76fdb7d h: refs/heads/master i: 139953: ea735c6 139951: 974d7e3 v: v3
git-mirror · Mar 24, 2009 · 114e47f · 114e47f
1 parent 544c617
commit 114e47f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 47 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf5fe9ed73c2e696d3256ff18f926b103097abd2
+refs/heads/master: 76fdb7d6bd7922353abc8a1407c6dde3789042ce
diff --git a/trunk/arch/m68k/include/asm/pci.h b/trunk/arch/m68k/include/asm/pci.h
@@ -1,5 +1,12 @@
-#ifdef __uClinux__
-#include "pci_no.h"
-#else
-#include "pci_mm.h"
-#endif
+#ifndef _ASM_M68K_PCI_H
+#define _ASM_M68K_PCI_H
+
+#include <asm-generic/pci-dma-compat.h>
+
+/* The PCI address space does equal the physical memory
+ * address space.  The networking and block device layers use
+ * this boolean for bounce buffer decisions.
+ */
+#define PCI_DMA_BUS_IS_PHYS	(1)
+
+#endif /* _ASM_M68K_PCI_H */
diff --git a/trunk/arch/m68k/include/asm/pci_mm.h b/trunk/arch/m68k/include/asm/pci_mm.h
diff --git a/trunk/arch/m68k/include/asm/pci_no.h b/trunk/arch/m68k/include/asm/pci_no.h