diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-28 16:13:44 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-28 23:09:44 +0000 |
| commit | 0114cb40d05c6cbde31bbb623e5e2d4252ecde02 (patch) | |
| tree | 99d314a5d1b5f98e4a1c805a083192c1f59f9f22 /arch/arm/mach-iop32x | |
| parent | 47190a3350032ecbb6e17b18e22a1dca2265013a (diff) | |
| download | linux-3.10-0114cb40d05c6cbde31bbb623e5e2d4252ecde02.tar.gz linux-3.10-0114cb40d05c6cbde31bbb623e5e2d4252ecde02.tar.bz2 linux-3.10-0114cb40d05c6cbde31bbb623e5e2d4252ecde02.zip | |
[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/arm/mach-iop32x')
| -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 |
4 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-iop32x/include/mach/io.h b/arch/arm/mach-iop32x/include/mach/io.h index ce54705ba3d..339e5854728 100644 --- a/arch/arm/mach-iop32x/include/mach/io.h +++ b/arch/arm/mach-iop32x/include/mach/io.h @@ -11,7 +11,7 @@ #ifndef __IO_H #define __IO_H -#include <mach/hardware.h> +#include <asm/hardware/iop3xx.h> extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, unsigned int mtype); diff --git a/arch/arm/mach-iop32x/include/mach/memory.h b/arch/arm/mach-iop32x/include/mach/memory.h index 61c7bdb26a8..c30f6450ad5 100644 --- a/arch/arm/mach-iop32x/include/mach/memory.h +++ b/arch/arm/mach-iop32x/include/mach/memory.h @@ -5,8 +5,6 @@ #ifndef __MEMORY_H #define __MEMORY_H -#include <mach/hardware.h> - /* * Physical DRAM offset. */ diff --git a/arch/arm/mach-iop32x/include/mach/system.h b/arch/arm/mach-iop32x/include/mach/system.h index 20f923e54f4..32d9e5b0a28 100644 --- a/arch/arm/mach-iop32x/include/mach/system.h +++ b/arch/arm/mach-iop32x/include/mach/system.h @@ -7,8 +7,9 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - #include <asm/mach-types.h> +#include <asm/hardware/iop3xx.h> +#include <mach/n2100.h> static inline void arch_idle(void) { diff --git a/arch/arm/mach-iop32x/include/mach/timex.h b/arch/arm/mach-iop32x/include/mach/timex.h index a541afced3c..7262ab81419 100644 --- a/arch/arm/mach-iop32x/include/mach/timex.h +++ b/arch/arm/mach-iop32x/include/mach/timex.h @@ -3,7 +3,4 @@ * * IOP32x architecture timex specifications */ - -#include <mach/hardware.h> - #define CLOCK_TICK_RATE (100 * HZ) |