[ARM] footbridge: avoid polluting the kernel's namespace

Avoid unnecessarily pollution of the kernel's namespace by avoiding
mach/hardware.h in mach/io.h.  Include this header file where necessary.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-footbridge/include/mach/hardware.h b/arch/arm/mach-footbridge/include/mach/hardware.h
index ffaea90486f91dc98b9b5c60bd43d47e4ebd9794..66426ebfb918e0a446914ff97a27f3b0e7e66858 100644 (file)
--- a/arch/arm/mach-footbridge/include/mach/hardware.h
+++ b/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/arch/arm/mach-footbridge/include/mach/io.h b/arch/arm/mach-footbridge/include/mach/io.h
index a7b066239996880bbeaec451dfb1386ce7fe452a..101a4fe90bdec17cc4cf7fa563979fa93c22a5f0 100644 (file)
--- a/arch/arm/mach-footbridge/include/mach/io.h
+++ b/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