diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-07-05 10:25:44 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-07-05 20:01:03 -0400 |
commit | 39f1601c3f840f6e055f7d9726a1a1e9acbefd78 (patch) | |
tree | e7bfc3357b6fc91b688a77114df71512e14e9573 /arch/arm/mach-ixp4xx | |
parent | 069d0a7870f45a3eb0540825d6dc517eda2a525a (diff) |
ARM: ixp4xx: avoid circular header dependency
With the new linux/reboot.h header file dependency added, we can no
longer build ixp4xx. The easiest way to avoid that is to remove the
inclusion of mach/hardware.h from mach/timex.h, which does not need
that header anyway.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-ixp4xx')
-rw-r--r-- | arch/arm/mach-ixp4xx/dsmg600-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/timex.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/omixp-setup.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c index 5d413f8c5700..63de1b3fd06b 100644 --- a/arch/arm/mach-ixp4xx/dsmg600-setup.c +++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c | |||
@@ -27,6 +27,8 @@ | |||
27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
28 | #include <linux/i2c-gpio.h> | 28 | #include <linux/i2c-gpio.h> |
29 | 29 | ||
30 | #include <mach/hardware.h> | ||
31 | |||
30 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
31 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
32 | #include <asm/mach/flash.h> | 34 | #include <asm/mach/flash.h> |
diff --git a/arch/arm/mach-ixp4xx/include/mach/timex.h b/arch/arm/mach-ixp4xx/include/mach/timex.h index c9e930f29339..0396d89f947c 100644 --- a/arch/arm/mach-ixp4xx/include/mach/timex.h +++ b/arch/arm/mach-ixp4xx/include/mach/timex.h | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <mach/hardware.h> | 6 | #include <mach/ixp4xx-regs.h> |
7 | 7 | ||
8 | /* | 8 | /* |
9 | * We use IXP425 General purpose timer for our timer needs, it runs at | 9 | * We use IXP425 General purpose timer for our timer needs, it runs at |
diff --git a/arch/arm/mach-ixp4xx/omixp-setup.c b/arch/arm/mach-ixp4xx/omixp-setup.c index 46a89f5e8269..75ef03dc9964 100644 --- a/arch/arm/mach-ixp4xx/omixp-setup.c +++ b/arch/arm/mach-ixp4xx/omixp-setup.c | |||
@@ -27,6 +27,8 @@ | |||
27 | #include <asm/mach/arch.h> | 27 | #include <asm/mach/arch.h> |
28 | #include <asm/mach/flash.h> | 28 | #include <asm/mach/flash.h> |
29 | 29 | ||
30 | #include <mach/hardware.h> | ||
31 | |||
30 | static struct resource omixp_flash_resources[] = { | 32 | static struct resource omixp_flash_resources[] = { |
31 | { | 33 | { |
32 | .flags = IORESOURCE_MEM, | 34 | .flags = IORESOURCE_MEM, |