Commit 39f1601c authored by Arnd Bergmann's avatar Arnd Bergmann

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: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Jason Cooper <jason@lakedaemon.net>
parent 069d0a78
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-gpio.h> #include <linux/i2c-gpio.h>
#include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
......
...@@ -3,7 +3,7 @@ ...@@ -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 * We use IXP425 General purpose timer for our timer needs, it runs at
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/hardware.h>
static struct resource omixp_flash_resources[] = { static struct resource omixp_flash_resources[] = {
{ {
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment