summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ixp4xx/include/mach
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-07-05 16:25:44 +0200
committerArnd Bergmann <arnd@arndb.de>2013-07-06 02:01:03 +0200
commit39f1601c3f840f6e055f7d9726a1a1e9acbefd78 (patch)
treee7bfc3357b6fc91b688a77114df71512e14e9573 /arch/arm/mach-ixp4xx/include/mach
parent069d0a7870f45a3eb0540825d6dc517eda2a525a (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/include/mach')
-rw-r--r--arch/arm/mach-ixp4xx/include/mach/timex.h2
1 files changed, 1 insertions, 1 deletions
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 @@
*
*/
-#include <mach/hardware.h>
+#include <mach/ixp4xx-regs.h>
/*
* We use IXP425 General purpose timer for our timer needs, it runs at