aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-footbridge
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-28 11:13:44 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-28 11:55:32 -0500
commit326878173bd352f968c958a4936fc2bc3540becd (patch)
treecd8bbaffb80373be3e9578a15daf07ad78f25b8e /arch/arm/mach-footbridge
parent325045fa5358536edc0cc788ec32e9e2409ff0b1 (diff)
[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>
Diffstat (limited to 'arch/arm/mach-footbridge')
-rw-r--r--arch/arm/mach-footbridge/include/mach/hardware.h3
-rw-r--r--arch/arm/mach-footbridge/include/mach/io.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-footbridge/include/mach/hardware.h b/arch/arm/mach-footbridge/include/mach/hardware.h
index ffaea90486f9..66426ebfb918 100644
--- a/arch/arm/mach-footbridge/include/mach/hardware.h
+++ b/arch/arm/mach-footbridge/include/mach/hardware.h
@@ -28,9 +28,6 @@
28#define XBUS_SIZE 0x00100000 28#define XBUS_SIZE 0x00100000
29#define XBUS_BASE 0xff800000 29#define XBUS_BASE 0xff800000
30 30
31#define PCIO_SIZE 0x00100000
32#define PCIO_BASE 0xff000000
33
34#define ARMCSR_SIZE 0x00100000 31#define ARMCSR_SIZE 0x00100000
35#define ARMCSR_BASE 0xfe000000 32#define ARMCSR_BASE 0xfe000000
36 33
diff --git a/arch/arm/mach-footbridge/include/mach/io.h b/arch/arm/mach-footbridge/include/mach/io.h
index a7b066239996..101a4fe90bde 100644
--- a/arch/arm/mach-footbridge/include/mach/io.h
+++ b/arch/arm/mach-footbridge/include/mach/io.h
@@ -14,7 +14,8 @@
14#ifndef __ASM_ARM_ARCH_IO_H 14#ifndef __ASM_ARM_ARCH_IO_H
15#define __ASM_ARM_ARCH_IO_H 15#define __ASM_ARM_ARCH_IO_H
16 16
17#include <mach/hardware.h> 17#define PCIO_SIZE 0x00100000
18#define PCIO_BASE 0xff000000
18 19
19#define IO_SPACE_LIMIT 0xffff 20#define IO_SPACE_LIMIT 0xffff
20 21