summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ixp4xx/omixp-setup.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-07-05 18:25:44 +0400
committerArnd Bergmann <arnd@arndb.de>2013-07-06 04:01:03 +0400
commit39f1601c3f840f6e055f7d9726a1a1e9acbefd78 (patch)
treee7bfc3357b6fc91b688a77114df71512e14e9573 /arch/arm/mach-ixp4xx/omixp-setup.c
parent069d0a7870f45a3eb0540825d6dc517eda2a525a (diff)
downloadlinux-39f1601c3f840f6e055f7d9726a1a1e9acbefd78.tar.xz
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/omixp-setup.c')
-rw-r--r--arch/arm/mach-ixp4xx/omixp-setup.c2
1 files changed, 2 insertions, 0 deletions
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 @@
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
+#include <mach/hardware.h>
+
static struct resource omixp_flash_resources[] = {
{
.flags = IORESOURCE_MEM,