commit a09e64fbc0094e3073dbb09c3b4bfe4ab669244b
author Russell King <rmk@dyn-67.arm.linux.org.uk> Tue Aug 05 16:14:15 2008 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Thu Aug 07 09:55:48 2008 +0100
tree 69689f467179891b498bd7423fcf61925173db31
parent a1b81a84fff05dbfef45b7012c26e1fee9973e5d

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

This just leaves include/asm-arm/plat-* to deal with.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/mach-integrator/core.c

diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index f439bf1..8bacf6d4 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -20,11 +20,11 @@
 #include <linux/amba/bus.h>
 #include <linux/amba/serial.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/hardware/arm_timer.h>
-#include <asm/arch/cm.h>
+#include <mach/cm.h>
 #include <asm/system.h>
 #include <asm/leds.h>
 #include <asm/mach/time.h>