Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-ixp4xx/dsmg600-setup.c

+2 −0
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-ixp4xx/include/mach/timex.h

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-ixp4xx/omixp-setup.c

+2 −0
Original line number Diff line number Diff line
@@ -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,