Merge nommu tree

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-integrator / io.h

diff --git a/include/asm-arm/arch-integrator/io.h b/include/asm-arm/arch-integrator/io.h
index 1329a731160d70c4a2f40c93cf5868aa4a52c1ea..31f2deab51b0d54d3cd8f891b0a56da01f0d3e34 100644 (file)
--- a/include/asm-arm/arch-integrator/io.h
+++ b/include/asm-arm/arch-integrator/io.h
@@ -20,10 +20,16 @@
 #ifndef __ASM_ARM_ARCH_IO_H
 #define __ASM_ARM_ARCH_IO_H
 
-#include <asm/hardware.h>
-
 #define IO_SPACE_LIMIT 0xffff
 
+/*
+ * WARNING: this has to mirror definitions in platform.h
+ */
+#define PCI_MEMORY_VADDR        0xe8000000
+#define PCI_CONFIG_VADDR        0xec000000
+#define PCI_V3_VADDR            0xed000000
+#define PCI_IO_VADDR            0xee000000
+
 #define __io(a)                        ((void __iomem *)(PCI_IO_VADDR + (a)))
 #define __mem_pci(a)           (a)
 #define __mem_isa(a)           ((a) + PCI_MEMORY_VADDR)