diff --git a/[refs] b/[refs]
index 676d83121a65..f15156f29f5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 325045fa5358536edc0cc788ec32e9e2409ff0b1
+refs/heads/master: 326878173bd352f968c958a4936fc2bc3540becd
diff --git a/trunk/arch/arm/mach-footbridge/include/mach/hardware.h b/trunk/arch/arm/mach-footbridge/include/mach/hardware.h
index ffaea90486f9..66426ebfb918 100644
--- a/trunk/arch/arm/mach-footbridge/include/mach/hardware.h
+++ b/trunk/arch/arm/mach-footbridge/include/mach/hardware.h
@@ -28,9 +28,6 @@
 #define XBUS_SIZE		0x00100000
 #define XBUS_BASE		0xff800000
 
-#define PCIO_SIZE		0x00100000
-#define PCIO_BASE		0xff000000
-
 #define ARMCSR_SIZE		0x00100000
 #define ARMCSR_BASE		0xfe000000
 
diff --git a/trunk/arch/arm/mach-footbridge/include/mach/io.h b/trunk/arch/arm/mach-footbridge/include/mach/io.h
index a7b066239996..101a4fe90bde 100644
--- a/trunk/arch/arm/mach-footbridge/include/mach/io.h
+++ b/trunk/arch/arm/mach-footbridge/include/mach/io.h
@@ -14,7 +14,8 @@
 #ifndef __ASM_ARM_ARCH_IO_H
 #define __ASM_ARM_ARCH_IO_H
 
-#include <mach/hardware.h>
+#define PCIO_SIZE		0x00100000
+#define PCIO_BASE		0xff000000
 
 #define IO_SPACE_LIMIT 0xffff