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

Commit a285edcf authored by Russell King's avatar Russell King
Browse files

ARM: Fix Versatile&Integrator includes to behave in the same way as Realview 



Realview doesn't include mach/platform.h in mach/hardware.h, so
make versatile behave in the same way.  Also, move the definition
of __io_address() into mach/hardware.h, just like Realview.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 28d7f4ec

arch/arm/mach-integrator/core.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/clkdev.h>

#include <mach/clkdev.h>

#include <mach/hardware.h>

#include <mach/platform.h>

#include <asm/irq.h>

#include <asm/hardware/arm_timer.h>

#include <mach/cm.h>

arch/arm/mach-integrator/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/io.h>



#include <mach/hardware.h>

#include <mach/platform.h>

#include <asm/mach-types.h>

#include <asm/hardware/icst525.h>

arch/arm/mach-integrator/include/mach/entry-macro.S

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * warranty of any kind, whether express or implied.

 */

#include <mach/hardware.h>

#include <mach/platform.h>

#include <mach/irqs.h>



 		.macro	disable_fiq

arch/arm/mach-integrator/include/mach/hardware.h

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#define __ASM_ARCH_HARDWARE_H



#include <asm/sizes.h>

#include <mach/platform.h>



/*

 * Where in virtual memory the IO devices (timers, system controllers
@@ -48,5 +47,7 @@ 
#define PCIBIOS_MIN_IO		0x6000

#define PCIBIOS_MIN_MEM 	0x00100000



#define __io_address(n)		((void __iomem *)IO_ADDRESS(n))



#endif

arch/arm/mach-integrator/integrator_ap.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/io.h>



#include <mach/hardware.h>

#include <mach/platform.h>

#include <asm/irq.h>

#include <asm/setup.h>

#include <asm/param.h>		/* HZ */