diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-28 11:13:44 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-28 18:09:44 -0500 |
commit | 0114cb40d05c6cbde31bbb623e5e2d4252ecde02 (patch) | |
tree | 99d314a5d1b5f98e4a1c805a083192c1f59f9f22 /arch | |
parent | 47190a3350032ecbb6e17b18e22a1dca2265013a (diff) |
[ARM] iop3xx: avoid polluting the kernel's namespace
Avoid unnecessarily pollution of the kernel's namespace by avoiding
mach/hardware.h in mach/io.h, mach/memory.h and mach/timex.h. Include
this header file where necessary.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/io.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/memory.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/system.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/timex.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/io.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/memory.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/timex.h | 3 |
7 files changed, 4 insertions, 13 deletions
diff --git a/arch/arm/mach-iop32x/include/mach/io.h b/arch/arm/mach-iop32x/include/mach/io.h index ce54705ba3d4..339e5854728b 100644 --- a/arch/arm/mach-iop32x/include/mach/io.h +++ b/arch/arm/mach-iop32x/include/mach/io.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #ifndef __IO_H | 11 | #ifndef __IO_H |
12 | #define __IO_H | 12 | #define __IO_H |
13 | 13 | ||
14 | #include <mach/hardware.h> | 14 | #include <asm/hardware/iop3xx.h> |
15 | 15 | ||
16 | extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, | 16 | extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, |
17 | unsigned int mtype); | 17 | unsigned int mtype); |
diff --git a/arch/arm/mach-iop32x/include/mach/memory.h b/arch/arm/mach-iop32x/include/mach/memory.h index 61c7bdb26a81..c30f6450ad50 100644 --- a/arch/arm/mach-iop32x/include/mach/memory.h +++ b/arch/arm/mach-iop32x/include/mach/memory.h | |||
@@ -5,8 +5,6 @@ | |||
5 | #ifndef __MEMORY_H | 5 | #ifndef __MEMORY_H |
6 | #define __MEMORY_H | 6 | #define __MEMORY_H |
7 | 7 | ||
8 | #include <mach/hardware.h> | ||
9 | |||
10 | /* | 8 | /* |
11 | * Physical DRAM offset. | 9 | * Physical DRAM offset. |
12 | */ | 10 | */ |
diff --git a/arch/arm/mach-iop32x/include/mach/system.h b/arch/arm/mach-iop32x/include/mach/system.h index 20f923e54f46..32d9e5b0a28d 100644 --- a/arch/arm/mach-iop32x/include/mach/system.h +++ b/arch/arm/mach-iop32x/include/mach/system.h | |||
@@ -7,8 +7,9 @@ | |||
7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | |||
11 | #include <asm/mach-types.h> | 10 | #include <asm/mach-types.h> |
11 | #include <asm/hardware/iop3xx.h> | ||
12 | #include <mach/n2100.h> | ||
12 | 13 | ||
13 | static inline void arch_idle(void) | 14 | static inline void arch_idle(void) |
14 | { | 15 | { |
diff --git a/arch/arm/mach-iop32x/include/mach/timex.h b/arch/arm/mach-iop32x/include/mach/timex.h index a541afced3cb..7262ab81419d 100644 --- a/arch/arm/mach-iop32x/include/mach/timex.h +++ b/arch/arm/mach-iop32x/include/mach/timex.h | |||
@@ -3,7 +3,4 @@ | |||
3 | * | 3 | * |
4 | * IOP32x architecture timex specifications | 4 | * IOP32x architecture timex specifications |
5 | */ | 5 | */ |
6 | |||
7 | #include <mach/hardware.h> | ||
8 | |||
9 | #define CLOCK_TICK_RATE (100 * HZ) | 6 | #define CLOCK_TICK_RATE (100 * HZ) |
diff --git a/arch/arm/mach-iop33x/include/mach/io.h b/arch/arm/mach-iop33x/include/mach/io.h index 158874631217..e99a7ed6d050 100644 --- a/arch/arm/mach-iop33x/include/mach/io.h +++ b/arch/arm/mach-iop33x/include/mach/io.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #ifndef __IO_H | 11 | #ifndef __IO_H |
12 | #define __IO_H | 12 | #define __IO_H |
13 | 13 | ||
14 | #include <mach/hardware.h> | 14 | #include <asm/hardware/iop3xx.h> |
15 | 15 | ||
16 | extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, | 16 | extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, |
17 | unsigned int mtype); | 17 | unsigned int mtype); |
diff --git a/arch/arm/mach-iop33x/include/mach/memory.h b/arch/arm/mach-iop33x/include/mach/memory.h index c46c6ba30186..a30a96aa6d2d 100644 --- a/arch/arm/mach-iop33x/include/mach/memory.h +++ b/arch/arm/mach-iop33x/include/mach/memory.h | |||
@@ -5,8 +5,6 @@ | |||
5 | #ifndef __MEMORY_H | 5 | #ifndef __MEMORY_H |
6 | #define __MEMORY_H | 6 | #define __MEMORY_H |
7 | 7 | ||
8 | #include <mach/hardware.h> | ||
9 | |||
10 | /* | 8 | /* |
11 | * Physical DRAM offset. | 9 | * Physical DRAM offset. |
12 | */ | 10 | */ |
diff --git a/arch/arm/mach-iop33x/include/mach/timex.h b/arch/arm/mach-iop33x/include/mach/timex.h index c75760844d49..54c589091d6e 100644 --- a/arch/arm/mach-iop33x/include/mach/timex.h +++ b/arch/arm/mach-iop33x/include/mach/timex.h | |||
@@ -3,7 +3,4 @@ | |||
3 | * | 3 | * |
4 | * IOP3xx architecture timex specifications | 4 | * IOP3xx architecture timex specifications |
5 | */ | 5 | */ |
6 | |||
7 | #include <mach/hardware.h> | ||
8 | |||
9 | #define CLOCK_TICK_RATE (100 * HZ) | 6 | #define CLOCK_TICK_RATE (100 * HZ) |