aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k/include/asm/pci.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2009-01-29 15:33:15 +1000
committerGreg Ungerer <gerg@uclinux.org>2009-03-24 15:17:41 +1000
commit76fdb7d6bd7922353abc8a1407c6dde3789042ce (patch)
treeb6ad751bf6170f4e5144a527beab2de21301e433 /arch/m68k/include/asm/pci.h
parentbf5fe9ed73c2e696d3256ff18f926b103097abd2 (diff)
downloadlinux-76fdb7d6bd7922353abc8a1407c6dde3789042ce.tar.gz
m68k: use the mmu pci.h for m68knommu as well
The (m68knommu) COMEMPCI support has been removed from the kernel, so now the mmu pci.h can be used on non-mmu setups as well. Remove the non-mmu pci_no.h and revert the pci_mm.h to be pci.h. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/pci.h')
-rw-r--r--arch/m68k/include/asm/pci.h17
1 files changed, 12 insertions, 5 deletions
diff --git a/arch/m68k/include/asm/pci.h b/arch/m68k/include/asm/pci.h
index dbea9537308..4ad0aea48ab 100644
--- a/arch/m68k/include/asm/pci.h
+++ b/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 */