[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>

49 files changed, 71 insertions, 71 deletions

diff --git a/include/asm-arm/arch-s3c2410/anubis-cpld.h b/arch/arm/mach-s3c2410/include/mach/anubis-cpld.h
index 168b93fee529..1b614d5a81f3 100644
--- a/include/asm-arm/arch-s3c2410/anubis-cpld.h
+++ b/arch/arm/mach-s3c2410/include/mach/anubis-cpld.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/anubis-cpld.h
+/* arch/arm/mach-s3c2410/include/mach/anubis-cpld.h
  *
  * Copyright (c) 2005 Simtec Electronics
  *	http://www.simtec.co.uk/products/
diff --git a/include/asm-arm/arch-s3c2410/anubis-irq.h b/arch/arm/mach-s3c2410/include/mach/anubis-irq.h
index cd77a70d45c0..a2a328134e34 100644
--- a/include/asm-arm/arch-s3c2410/anubis-irq.h
+++ b/arch/arm/mach-s3c2410/include/mach/anubis-irq.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/anubis-irq.h
+/* arch/arm/mach-s3c2410/include/mach/anubis-irq.h
  *
  * Copyright (c) 2005 Simtec Electronics
  *	http://www.simtec.co.uk/products/
diff --git a/include/asm-arm/arch-s3c2410/anubis-map.h b/arch/arm/mach-s3c2410/include/mach/anubis-map.h
index 830d114261da..c9deb3a5b2c3 100644
--- a/include/asm-arm/arch-s3c2410/anubis-map.h
+++ b/arch/arm/mach-s3c2410/include/mach/anubis-map.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/anubis-map.h
+/* arch/arm/mach-s3c2410/include/mach/anubis-map.h
  *
  * Copyright (c) 2005 Simtec Electronics
  *	http://www.simtec.co.uk/products/
diff --git a/include/asm-arm/arch-s3c2410/audio.h b/arch/arm/mach-s3c2410/include/mach/audio.h
index 0a6977fb5770..de0e8da48bc3 100644
--- a/include/asm-arm/arch-s3c2410/audio.h
+++ b/arch/arm/mach-s3c2410/include/mach/audio.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/audio.h
+/* arch/arm/mach-s3c2410/include/mach/audio.h
  *
  * Copyright (c) 2004-2005 Simtec Electronics
  *	http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/bast-cpld.h b/arch/arm/mach-s3c2410/include/mach/bast-cpld.h
index 034d2c5a47c4..20493b048360 100644
--- a/include/asm-arm/arch-s3c2410/bast-cpld.h
+++ b/arch/arm/mach-s3c2410/include/mach/bast-cpld.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/bast-cpld.h
+/* arch/arm/mach-s3c2410/include/mach/bast-cpld.h
  *
  * Copyright (c) 2003,2004 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/bast-irq.h b/arch/arm/mach-s3c2410/include/mach/bast-irq.h
index 726c0466f85a..501c202b53cf 100644
--- a/include/asm-arm/arch-s3c2410/bast-irq.h
+++ b/arch/arm/mach-s3c2410/include/mach/bast-irq.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/bast-irq.h
+/* arch/arm/mach-s3c2410/include/mach/bast-irq.h
  *
  * Copyright (c) 2003,2004 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/bast-map.h b/arch/arm/mach-s3c2410/include/mach/bast-map.h
index 86ac1c108db8..c2c5baf07345 100644
--- a/include/asm-arm/arch-s3c2410/bast-map.h
+++ b/arch/arm/mach-s3c2410/include/mach/bast-map.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/bast-map.h
+/* arch/arm/mach-s3c2410/include/mach/bast-map.h
  *
  * Copyright (c) 2003,2004 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/bast-pmu.h b/arch/arm/mach-s3c2410/include/mach/bast-pmu.h
index 37a11fe54a78..61684cb8ce59 100644
--- a/include/asm-arm/arch-s3c2410/bast-pmu.h
+++ b/arch/arm/mach-s3c2410/include/mach/bast-pmu.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/bast-pmu.h
+/* arch/arm/mach-s3c2410/include/mach/bast-pmu.h
  *
  * Copyright (c) 2003,2004 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/debug-macro.S b/arch/arm/mach-s3c2410/include/mach/debug-macro.S
index 89076c322726..682df23087ab 100644
--- a/include/asm-arm/arch-s3c2410/debug-macro.S
+++ b/arch/arm/mach-s3c2410/include/mach/debug-macro.S
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/debug-macro.S
+/* arch/arm/mach-s3c2410/include/mach/debug-macro.S
  *
  * Debugging macro include header
  *
@@ -12,8 +12,8 @@
  * published by the Free Software Foundation.
 */
 
-#include <asm/arch/map.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/map.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c/regs-serial.h>
 
 #define S3C2410_UART1_OFF (0x4000)
diff --git a/include/asm-arm/arch-s3c2410/dma.h b/arch/arm/mach-s3c2410/include/mach/dma.h
index 86eaa0c2dc1e..891b53cd69b8 100644
--- a/include/asm-arm/arch-s3c2410/dma.h
+++ b/arch/arm/mach-s3c2410/include/mach/dma.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/dma.h
+/* arch/arm/mach-s3c2410/include/mach/dma.h
  *
  * Copyright (C) 2003,2004,2006 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
@@ -14,7 +14,7 @@
 #define __ASM_ARCH_DMA_H __FILE__
 
 #include <linux/sysdev.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 /*
  * This is the maximum DMA address(physical address) that can be DMAd to.
diff --git a/include/asm-arm/arch-s3c2410/entry-macro.S b/arch/arm/mach-s3c2410/include/mach/entry-macro.S
index f70d051b267b..473b3cd37d9b 100644
--- a/include/asm-arm/arch-s3c2410/entry-macro.S
+++ b/arch/arm/mach-s3c2410/include/mach/entry-macro.S
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-s3c2410/entry-macro.S
+ * arch/arm/mach-s3c2410/include/mach/entry-macro.S
  *
  * Low-level IRQ helper macros for S3C2410-based platforms
  *
@@ -19,7 +19,7 @@
 #define INTPND		(0x10)
 #define INTOFFSET	(0x14)
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 
 	.macro  get_irqnr_preamble, base, tmp
diff --git a/include/asm-arm/arch-s3c2410/fb.h b/arch/arm/mach-s3c2410/include/mach/fb.h
index 5d0262601a7e..eee0654eb8fb 100644
--- a/include/asm-arm/arch-s3c2410/fb.h
+++ b/arch/arm/mach-s3c2410/include/mach/fb.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/fb.h
+/* arch/arm/mach-s3c2410/include/mach/fb.h
  *
  * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org>
  *
@@ -12,7 +12,7 @@
 #ifndef __ASM_ARM_FB_H
 #define __ASM_ARM_FB_H
 
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-lcd.h>
 
 struct s3c2410fb_hw {
 	unsigned long	lcdcon1;
diff --git a/include/asm-arm/arch-s3c2410/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h
index 18e10d2c35ea..3b52b86498a6 100644
--- a/include/asm-arm/arch-s3c2410/gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/gpio.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/gpio.h
+/* arch/arm/mach-s3c2410/include/mach/gpio.h
  *
  * Copyright (c) 2008 Simtec Electronics
  *	http://armlinux.simtec.co.uk/
diff --git a/include/asm-arm/arch-s3c2410/h1940-latch.h b/arch/arm/mach-s3c2410/include/mach/h1940-latch.h
index c3de5ab102eb..d8a832729a8a 100644
--- a/include/asm-arm/arch-s3c2410/h1940-latch.h
+++ b/arch/arm/mach-s3c2410/include/mach/h1940-latch.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/h1940-latch.h
+/* arch/arm/mach-s3c2410/include/mach/h1940-latch.h
  *
  * Copyright (c) 2005 Simtec Electronics
  *	http://armlinux.simtec.co.uk/
diff --git a/include/asm-arm/arch-s3c2410/h1940.h b/arch/arm/mach-s3c2410/include/mach/h1940.h
index 6135592e60f2..4559784129c0 100644
--- a/include/asm-arm/arch-s3c2410/h1940.h
+++ b/arch/arm/mach-s3c2410/include/mach/h1940.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/h1940.h
+/* arch/arm/mach-s3c2410/include/mach/h1940.h
  *
  * Copyright 2006 Ben Dooks <ben-linux@fluff.org>
  *
diff --git a/include/asm-arm/arch-s3c2410/hardware.h b/arch/arm/mach-s3c2410/include/mach/hardware.h
index 6dd10be43145..74d5a1a4024c 100644
--- a/include/asm-arm/arch-s3c2410/hardware.h
+++ b/arch/arm/mach-s3c2410/include/mach/hardware.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/hardware.h
+/* arch/arm/mach-s3c2410/include/mach/hardware.h
  *
  * Copyright (c) 2003 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
@@ -127,7 +127,7 @@ extern int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state);
 #endif /* __ASSEMBLY__ */
 
 #include <asm/sizes.h>
-#include <asm/arch/map.h>
+#include <mach/map.h>
 
 /* machine specific hardware definitions should go after this */
 
diff --git a/include/asm-arm/arch-s3c2410/idle.h b/arch/arm/mach-s3c2410/include/mach/idle.h
index eed450608f9c..e9ddd706b16e 100644
--- a/include/asm-arm/arch-s3c2410/idle.h
+++ b/arch/arm/mach-s3c2410/include/mach/idle.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/idle.h
+/* arch/arm/mach-s3c2410/include/mach/idle.h
  *
  * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk>
  *		http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/io.h b/arch/arm/mach-s3c2410/include/mach/io.h
index 3756c993776c..9813dbf2ae4f 100644
--- a/include/asm-arm/arch-s3c2410/io.h
+++ b/arch/arm/mach-s3c2410/include/mach/io.h
@@ -1,6 +1,6 @@
 /*
- * linux/include/asm-arm/arch-s3c2410/io.h
- *  from linux/include/asm-arm/arch-rpc/io.h
+ * arch/arm/mach-s3c2410/include/mach/io.h
+ *  from arch/arm/mach-rpc/include/mach/io.h
  *
  * Copyright (C) 1997 Russell King
  *	     (C) 2003 Simtec Electronics
@@ -9,7 +9,7 @@
 #ifndef __ASM_ARM_ARCH_IO_H
 #define __ASM_ARM_ARCH_IO_H
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #define IO_SPACE_LIMIT 0xffffffff
 
diff --git a/include/asm-arm/arch-s3c2410/irqs.h b/arch/arm/mach-s3c2410/include/mach/irqs.h
index f5435d8c3769..950c71bf1489 100644
--- a/include/asm-arm/arch-s3c2410/irqs.h
+++ b/arch/arm/mach-s3c2410/include/mach/irqs.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/irqs.h
+/* arch/arm/mach-s3c2410/include/mach/irqs.h
  *
  * Copyright (c) 2003-2005 Simtec Electronics
  *   Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/leds-gpio.h b/arch/arm/mach-s3c2410/include/mach/leds-gpio.h
index 800846ebddba..d8a7672519b6 100644
--- a/include/asm-arm/arch-s3c2410/leds-gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/leds-gpio.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/leds-gpio.h
+/* arch/arm/mach-s3c2410/include/mach/leds-gpio.h
  *
  * Copyright (c) 2006 Simtec Electronics
  *	http://armlinux.simtec.co.uk/
diff --git a/include/asm-arm/arch-s3c2410/map.h b/arch/arm/mach-s3c2410/include/mach/map.h
index b33ed3b05ef5..64bf7e94a5bf 100644
--- a/include/asm-arm/arch-s3c2410/map.h
+++ b/arch/arm/mach-s3c2410/include/mach/map.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/map.h
+/* arch/arm/mach-s3c2410/include/mach/map.h
  *
  * Copyright (c) 2003 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/memory.h b/arch/arm/mach-s3c2410/include/mach/memory.h
index 533e2436e707..93782628a786 100644
--- a/include/asm-arm/arch-s3c2410/memory.h
+++ b/arch/arm/mach-s3c2410/include/mach/memory.h
@@ -1,5 +1,5 @@
-/* linux/include/asm-arm/arch-s3c2410/memory.h
- *  from linux/include/asm-arm/arch-rpc/memory.h
+/* arch/arm/mach-s3c2410/include/mach/memory.h
+ *  from arch/arm/mach-rpc/include/mach/memory.h
  *
  *  Copyright (C) 1996,1997,1998 Russell King.
  *
diff --git a/include/asm-arm/arch-s3c2410/osiris-cpld.h b/arch/arm/mach-s3c2410/include/mach/osiris-cpld.h
index 229ab2351db6..e9e36b0abbac 100644
--- a/include/asm-arm/arch-s3c2410/osiris-cpld.h
+++ b/arch/arm/mach-s3c2410/include/mach/osiris-cpld.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/osiris-cpld.h
+/* arch/arm/mach-s3c2410/include/mach/osiris-cpld.h
  *
  * Copyright 2005 Simtec Electronics
  *	http://www.simtec.co.uk/products/
diff --git a/include/asm-arm/arch-s3c2410/osiris-map.h b/arch/arm/mach-s3c2410/include/mach/osiris-map.h
index b5c74d2b9aaa..639eff523d4e 100644
--- a/include/asm-arm/arch-s3c2410/osiris-map.h
+++ b/arch/arm/mach-s3c2410/include/mach/osiris-map.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/osiris-map.h
+/* arch/arm/mach-s3c2410/include/mach/osiris-map.h
  *
  * (c) 2005 Simtec Electronics
  *	http://www.simtec.co.uk/products/
diff --git a/include/asm-arm/arch-s3c2410/otom-map.h b/arch/arm/mach-s3c2410/include/mach/otom-map.h
index e40c93429854..f9277a52c145 100644
--- a/include/asm-arm/arch-s3c2410/otom-map.h
+++ b/arch/arm/mach-s3c2410/include/mach/otom-map.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/otom-map.h
+/* arch/arm/mach-s3c2410/include/mach/otom-map.h
  *
  * (c) 2005 Guillaume GOURAT / NexVision
  *          guillaume.gourat@nexvision.fr
diff --git a/include/asm-arm/arch-s3c2410/regs-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-clock.h
index 37661358b42b..d583688458a4 100644
--- a/include/asm-arm/arch-s3c2410/regs-clock.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-clock.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-clock.h
+/* arch/arm/mach-s3c2410/include/mach/regs-clock.h
  *
  * Copyright (c) 2003,2004,2005,2006 Simtec Electronics <linux@simtec.co.uk>
  *		      http://armlinux.simtec.co.uk/
diff --git a/include/asm-arm/arch-s3c2410/regs-dsc.h b/arch/arm/mach-s3c2410/include/mach/regs-dsc.h
index 1235df70f34e..3c3853cd3cf7 100644
--- a/include/asm-arm/arch-s3c2410/regs-dsc.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-dsc.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-dsc.h
+/* arch/arm/mach-s3c2410/include/mach/regs-dsc.h
  *
  * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk>
  *		      http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-gpio.h b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h
index 497dd06e2c99..30bec027f5fa 100644
--- a/include/asm-arm/arch-s3c2410/regs-gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-gpio.h
+/* arch/arm/mach-s3c2410/include/mach/regs-gpio.h
  *
  * Copyright (c) 2003,2004 Simtec Electronics <linux@simtec.co.uk>
  *		           http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-gpioj.h b/arch/arm/mach-s3c2410/include/mach/regs-gpioj.h
index 0362332faaf0..1202ca5e99f6 100644
--- a/include/asm-arm/arch-s3c2410/regs-gpioj.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-gpioj.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-gpioj.h
+/* arch/arm/mach-s3c2410/include/mach/regs-gpioj.h
  *
  * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk>
  *		      http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-irq.h b/arch/arm/mach-s3c2410/include/mach/regs-irq.h
index 498184cb8adc..b057c06d167a 100644
--- a/include/asm-arm/arch-s3c2410/regs-irq.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-irq.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-irq.h
+/* arch/arm/mach-s3c2410/include/mach/regs-irq.h
  *
  * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
  *		      http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-lcd.h b/arch/arm/mach-s3c2410/include/mach/regs-lcd.h
index bd854845697f..893b8742f954 100644
--- a/include/asm-arm/arch-s3c2410/regs-lcd.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-lcd.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-lcd.h
+/* arch/arm/mach-s3c2410/include/mach/regs-lcd.h
  *
  * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
  *		      http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-mem.h b/arch/arm/mach-s3c2410/include/mach/regs-mem.h
index 312ff93b63c6..f9926abd5cde 100644
--- a/include/asm-arm/arch-s3c2410/regs-mem.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-mem.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-mem.h
+/* arch/arm/mach-s3c2410/include/mach/regs-mem.h
  *
  * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk>
  *		http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-power.h b/arch/arm/mach-s3c2410/include/mach/regs-power.h
index 13d13b7cfe98..2d36353f57d7 100644
--- a/include/asm-arm/arch-s3c2410/regs-power.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-power.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-power.h
+/* arch/arm/mach-s3c2410/include/mach/regs-power.h
  *
  * Copyright (c) 2003,2004,2005,2006 Simtec Electronics <linux@simtec.co.uk>
  *		      http://armlinux.simtec.co.uk/
diff --git a/include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h
index c8c793e78936..a4bf27123170 100644
--- a/include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h
+/* arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h
  *
  * Copyright (c) 2008 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/regs-s3c2412.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h
index 783b18f5bcea..aa69dc79bc38 100644
--- a/include/asm-arm/arch-s3c2410/regs-s3c2412.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-s3c2412.h
+/* arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h
  *
  * Copyright 2007 Simtec Electronics
  *	http://armlinux.simtec.co.uk/
diff --git a/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
index c1414658d1c5..7dd458363a51 100644
--- a/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h
+/* arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
  *
  * Copyright (c) 2007 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/regs-sdi.h b/arch/arm/mach-s3c2410/include/mach/regs-sdi.h
index bfb222fa4abb..cbf2d8884e30 100644
--- a/include/asm-arm/arch-s3c2410/regs-sdi.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-sdi.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-sdi.h
+/* arch/arm/mach-s3c2410/include/mach/regs-sdi.h
  *
  * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk>
  *		      http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/reset.h b/arch/arm/mach-s3c2410/include/mach/reset.h
index 4f866cdecab0..f8c9387b049d 100644
--- a/include/asm-arm/arch-s3c2410/reset.h
+++ b/arch/arm/mach-s3c2410/include/mach/reset.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/reset.h
+/* arch/arm/mach-s3c2410/include/mach/reset.h
  *
  * Copyright (c) 2007 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/spi-gpio.h b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
index 73803731142a..3fe8be9ca110 100644
--- a/include/asm-arm/arch-s3c2410/spi-gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/spi-gpio.h
+/* arch/arm/mach-s3c2410/include/mach/spi-gpio.h
  *
  * Copyright (c) 2006 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/spi.h b/arch/arm/mach-s3c2410/include/mach/spi.h
index 442169887d3b..921b13b4f0a0 100644
--- a/include/asm-arm/arch-s3c2410/spi.h
+++ b/arch/arm/mach-s3c2410/include/mach/spi.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/spi.h
+/* arch/arm/mach-s3c2410/include/mach/spi.h
  *
  * Copyright (c) 2006 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/system-reset.h b/arch/arm/mach-s3c2410/include/mach/system-reset.h
index beeec770dcf7..ec2defebf0d5 100644
--- a/include/asm-arm/arch-s3c2410/system-reset.h
+++ b/arch/arm/mach-s3c2410/include/mach/system-reset.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/system-reset.h
+/* arch/arm/mach-s3c2410/include/mach/system-reset.h
  *
  * Copyright (c) 2008 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
@@ -10,11 +10,11 @@
  * published by the Free Software Foundation.
 */
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
 #include <asm/plat-s3c/regs-watchdog.h>
-#include <asm/arch/regs-clock.h>
+#include <mach/regs-clock.h>
 
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/include/asm-arm/arch-s3c2410/system.h b/arch/arm/mach-s3c2410/include/mach/system.h
index 98f690e7d33e..e9f676bc0116 100644
--- a/include/asm-arm/arch-s3c2410/system.h
+++ b/arch/arm/mach-s3c2410/include/mach/system.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/system.h
+/* arch/arm/mach-s3c2410/include/mach/system.h
  *
  * Copyright (c) 2003 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
@@ -10,14 +10,14 @@
  * published by the Free Software Foundation.
 */
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
-#include <asm/arch/map.h>
-#include <asm/arch/idle.h>
-#include <asm/arch/reset.h>
+#include <mach/map.h>
+#include <mach/idle.h>
+#include <mach/reset.h>
 
-#include <asm/arch/regs-clock.h>
+#include <mach/regs-clock.h>
 
 void (*s3c24xx_idle)(void);
 void (*s3c24xx_reset_hook)(void);
@@ -55,4 +55,4 @@ static void arch_idle(void)
 		s3c24xx_default_idle();
 }
 
-#include <asm/arch/system-reset.h>
+#include <mach/system-reset.h>
diff --git a/include/asm-arm/arch-s3c2410/timex.h b/arch/arm/mach-s3c2410/include/mach/timex.h
index c16a99c5a59a..2a425ed0a7e0 100644
--- a/include/asm-arm/arch-s3c2410/timex.h
+++ b/arch/arm/mach-s3c2410/include/mach/timex.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/timex.h
+/* arch/arm/mach-s3c2410/include/mach/timex.h
  *
  * Copyright (c) 2003-2005 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/uncompress.h b/arch/arm/mach-s3c2410/include/mach/uncompress.h
index 48a5731ee988..708e47459ffc 100644
--- a/include/asm-arm/arch-s3c2410/uncompress.h
+++ b/arch/arm/mach-s3c2410/include/mach/uncompress.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/uncompress.h
+/* arch/arm/mach-s3c2410/include/mach/uncompress.h
  *
  * Copyright (c) 2003, 2007 Simtec Electronics
  *	http://armlinux.simtec.co.uk/
@@ -14,8 +14,8 @@
 #ifndef __ASM_ARCH_UNCOMPRESS_H
 #define __ASM_ARCH_UNCOMPRESS_H
 
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/map.h>
+#include <mach/regs-gpio.h>
+#include <mach/map.h>
 
 /* working in physical space... */
 #undef S3C2410_GPIOREG
diff --git a/include/asm-arm/arch-s3c2410/usb-control.h b/arch/arm/mach-s3c2410/include/mach/usb-control.h
index 5bfa376e33dc..cd91d1591f31 100644
--- a/include/asm-arm/arch-s3c2410/usb-control.h
+++ b/arch/arm/mach-s3c2410/include/mach/usb-control.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/usb-control.h
+/* arch/arm/mach-s3c2410/include/mach/usb-control.h
  *
  * Copyright (c) 2004 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
@@ -11,7 +11,7 @@
 */
 
 #ifndef __ASM_ARCH_USBCONTROL_H
-#define __ASM_ARCH_USBCONTROL_H "include/asm-arm/arch-s3c2410/usb-control.h"
+#define __ASM_ARCH_USBCONTROL_H "arch/arm/mach-s3c2410/include/mach/usb-control.h"
 
 #define S3C_HCDFLG_USED	(1)
 
diff --git a/include/asm-arm/arch-s3c2410/vmalloc.h b/arch/arm/mach-s3c2410/include/mach/vmalloc.h
index 0ae3bdb7e03b..315b0078a34d 100644
--- a/include/asm-arm/arch-s3c2410/vmalloc.h
+++ b/arch/arm/mach-s3c2410/include/mach/vmalloc.h
@@ -1,6 +1,6 @@
-/* linux/include/asm-arm/arch-s3c2410/vmalloc.h
+/* arch/arm/mach-s3c2410/include/mach/vmalloc.h
  *
- * from linux/include/asm-arm/arch-iop3xx/vmalloc.h
+ * from arch/arm/mach-iop3xx/include/mach/vmalloc.h
  *
  * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
  *		      http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/vr1000-cpld.h b/arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h
index 0557b0a5ab1d..e4119913d7c5 100644
--- a/include/asm-arm/arch-s3c2410/vr1000-cpld.h
+++ b/arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/vr1000-cpld.h
+/* arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h
  *
  * Copyright (c) 2003 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/vr1000-irq.h b/arch/arm/mach-s3c2410/include/mach/vr1000-irq.h
index 890937083c61..f53f85b4ad8b 100644
--- a/include/asm-arm/arch-s3c2410/vr1000-irq.h
+++ b/arch/arm/mach-s3c2410/include/mach/vr1000-irq.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/vr1000-irq.h
+/* arch/arm/mach-s3c2410/include/mach/vr1000-irq.h
  *
  * Copyright (c) 2003,2004 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/vr1000-map.h b/arch/arm/mach-s3c2410/include/mach/vr1000-map.h
index 92a56a724a8c..99612fcc4eb2 100644
--- a/include/asm-arm/arch-s3c2410/vr1000-map.h
+++ b/arch/arm/mach-s3c2410/include/mach/vr1000-map.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/vr1000-map.h
+/* arch/arm/mach-s3c2410/include/mach/vr1000-map.h
  *
  * Copyright (c) 2003-2005 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
@@ -21,7 +21,7 @@
 #ifndef __ASM_ARCH_VR1000MAP_H
 #define __ASM_ARCH_VR1000MAP_H
 
-#include <asm/arch/bast-map.h>
+#include <mach/bast-map.h>
 
 #define VR1000_IOADDR(x) BAST_IOADDR(x)