Merge branch 'microblaze' of git://git-dev.xilinx.com/linux-2.6-xlnx into 2.6.31...

[zynq/linux.git] / arch / microblaze / include / asm / pci.h

diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index 9f0df5faf2c88d1d89b37ba56c7b535e0e29f4ba..68a9b2ff7748d3bea68cd4776b57b024e13292fd 100644 (file)
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -1 +1,19 @@
-#include <asm-generic/pci.h>
+#ifndef __ASM_MICROBLAZE_PCI_H
+#define __ASM_MICROBLAZE_PCI_H
+#ifdef __KERNEL__
+
+/* PCI support is still under development. This file provides the definition
+ * for PCI_DMA_BUS_IS_PHYS, which enables SCSI support. This is to support
+ * USB Mass Storage devices, such as thumb drives.
+ */
+
+#include <linux/io.h>
+
+/* The PCI address space does equal the physical memory
+ * address space (no IOMMU).  The IDE and SCSI device layers use
+ * this boolean for bounce buffer decisions.
+ */
+#define PCI_DMA_BUS_IS_PHYS     (1)
+
+#endif /* __KERNEL__ */
+#endif /* __ASM_MICROBLAZE_PCI_H */