Skip to content

Commit

Permalink
ARM: ixp4xx: avoid circular header dependency
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnd Bergmann committed Jul 6, 2013
1 parent 069d0a7 commit 39f1601
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions arch/arm/mach-ixp4xx/dsmg600-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-ixp4xx/include/mach/timex.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/mach-ixp4xx/omixp-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 39f1601

Please sign in to comment.