]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ARM: ixp4xx: avoid circular header dependency
authorArnd Bergmann <arnd@arndb.de>
Fri, 5 Jul 2013 14:25:44 +0000 (16:25 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 6 Jul 2013 00:01:03 +0000 (02:01 +0200)
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>
arch/arm/mach-ixp4xx/dsmg600-setup.c
arch/arm/mach-ixp4xx/include/mach/timex.h
arch/arm/mach-ixp4xx/omixp-setup.c

index 5d413f8c57002e1f623c37f9eedfaabcab2fecb2..63de1b3fd06bf0327549cf7670761ac7bccf7298 100644 (file)
@@ -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>
index c9e930f29339770a79dc36bc015b28e4b45a4414..0396d89f947c879e1279f6fb3e4ca38cc02d154f 100644 (file)
@@ -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 
index 46a89f5e82693f930c318abb0ce61f976b324b9b..75ef03dc996490893c70c23ceea874b42747a679 100644 (file)
@@ -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,