diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-07-05 16:25:44 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-07-06 02:01:03 +0200 |
commit | 39f1601c3f840f6e055f7d9726a1a1e9acbefd78 (patch) | |
tree | e7bfc3357b6fc91b688a77114df71512e14e9573 /arch/arm/mach-ixp4xx/dsmg600-setup.c | |
parent | 069d0a7870f45a3eb0540825d6dc517eda2a525a (diff) | |
download | blackbird-op-linux-39f1601c3f840f6e055f7d9726a1a1e9acbefd78.tar.gz blackbird-op-linux-39f1601c3f840f6e055f7d9726a1a1e9acbefd78.zip |
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/dsmg600-setup.c')
-rw-r--r-- | arch/arm/mach-ixp4xx/dsmg600-setup.c | 2 |
1 files changed, 2 insertions, 0 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 @@ #include <linux/i2c.h> #include <linux/i2c-gpio.h> +#include <mach/hardware.h> + #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/flash.h> |