25 files changed, 32 insertions, 32 deletions
diff --git a/include/asm-arm/arch-ks8695/debug-macro.S b/arch/arm/mach-ks8695/include/mach/debug-macro.S
index d2583ffffa95..3782c3559497 100644
--- a/include/asm-arm/arch-ks8695/debug-macro.S
+++ b/arch/arm/mach-ks8695/include/mach/debug-macro.S
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/debug-macro.S
+ * arch/arm/mach-ks8695/include/mach/debug-macro.S
  *
  * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>
  * Copyright (C) 2006 Simtec Electronics
@@ -11,8 +11,8 @@
  * published by the Free Software Foundation.
  */
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/regs-uart.h>
+#include <mach/hardware.h>
+#include <mach/regs-uart.h>
 
 	.macro	addruart, rx
 		mrc	p15, 0, \rx, c1, c0
diff --git a/include/asm-arm/arch-ks8695/devices.h b/arch/arm/mach-ks8695/include/mach/devices.h
index 7ad2c656e162..2744fecb429c 100644
--- a/include/asm-arm/arch-ks8695/devices.h
+++ b/arch/arm/mach-ks8695/include/mach/devices.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/devices.h
+ * arch/arm/mach-ks8695/include/mach/devices.h
  *
  * Copyright (C) 2006 Andrew Victor
  *
diff --git a/include/asm-arm/arch-ks8695/dma.h b/arch/arm/mach-ks8695/include/mach/dma.h
index e5159ed42a4b..561206280089 100644
--- a/include/asm-arm/arch-ks8695/dma.h
+++ b/arch/arm/mach-ks8695/include/mach/dma.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/dma.h
+ * arch/arm/mach-ks8695/include/mach/dma.h
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/include/asm-arm/arch-ks8695/entry-macro.S b/arch/arm/mach-ks8695/include/mach/entry-macro.S
index 3993cfe67cfa..b4fe0c11c6ce 100644
--- a/include/asm-arm/arch-ks8695/entry-macro.S
+++ b/arch/arm/mach-ks8695/include/mach/entry-macro.S
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/entry-macro.S
+ * arch/arm/mach-ks8695/include/mach/entry-macro.S
  *
  * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>
  * Copyright (C) 2006 Simtec Electronics
@@ -11,8 +11,8 @@
  * warranty of any kind, whether express or implied.
 */
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/regs-irq.h>
+#include <mach/hardware.h>
+#include <mach/regs-irq.h>
 
 	.macro	disable_fiq
 	.endm
diff --git a/include/asm-arm/arch-ks8695/gpio.h b/arch/arm/mach-ks8695/include/mach/gpio.h
index 65ceea28607b..73c84168761c 100644
--- a/include/asm-arm/arch-ks8695/gpio.h
+++ b/arch/arm/mach-ks8695/include/mach/gpio.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/gpio.h
+ * arch/arm/mach-ks8695/include/mach/gpio.h
  *
  * Copyright (C) 2006 Andrew Victor
  *
diff --git a/include/asm-arm/arch-ks8695/hardware.h b/arch/arm/mach-ks8695/include/mach/hardware.h
index cb732bff3288..1d640d075b7e 100644
--- a/include/asm-arm/arch-ks8695/hardware.h
+++ b/arch/arm/mach-ks8695/include/mach/hardware.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/hardware.h
+ * arch/arm/mach-ks8695/include/mach/hardware.h
  *
  * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>
  * Copyright (C) 2006 Simtec Electronics
diff --git a/include/asm-arm/arch-ks8695/io.h b/arch/arm/mach-ks8695/include/mach/io.h
index 8edc4bd6aadf..f364f24ffe1e 100644
--- a/include/asm-arm/arch-ks8695/io.h
+++ b/arch/arm/mach-ks8695/include/mach/io.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/io.h
+ * arch/arm/mach-ks8695/include/mach/io.h
  *
  * Copyright (C) 2006 Andrew Victor
  *
diff --git a/include/asm-arm/arch-ks8695/irqs.h b/arch/arm/mach-ks8695/include/mach/irqs.h
index 8b1c4fe96a81..86fc9e6ce404 100644
--- a/include/asm-arm/arch-ks8695/irqs.h
+++ b/arch/arm/mach-ks8695/include/mach/irqs.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-ks8695/irqs.h
+ * arch/arm/mach-ks8695/include/mach/irqs.h
  *
  * Copyright (C) 2006 Simtec Electronics
  *   Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-ks8695/memory.h b/arch/arm/mach-ks8695/include/mach/memory.h
index 1b542f77977a..dadbe66cb75c 100644
--- a/include/asm-arm/arch-ks8695/memory.h
+++ b/arch/arm/mach-ks8695/include/mach/memory.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/memory.h
+ * arch/arm/mach-ks8695/include/mach/memory.h
  *
  * Copyright (C) 2006 Andrew Victor
  *
@@ -13,7 +13,7 @@
 #ifndef __ASM_ARCH_MEMORY_H
 #define __ASM_ARCH_MEMORY_H
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 /*
  * Physical SRAM offset.
diff --git a/include/asm-arm/arch-ks8695/regs-gpio.h b/arch/arm/mach-ks8695/include/mach/regs-gpio.h
index 6b95d77aea19..0df6fe61d1ce 100644
--- a/include/asm-arm/arch-ks8695/regs-gpio.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-gpio.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/regs-gpio.h
+ * arch/arm/mach-ks8695/include/mach/regs-gpio.h
  *
  * Copyright (C) 2007 Andrew Victor
  *
diff --git a/include/asm-arm/arch-ks8695/regs-hpna.h b/arch/arm/mach-ks8695/include/mach/regs-hpna.h
index 14091cdec103..815ce5c2e3b9 100644
--- a/include/asm-arm/arch-ks8695/regs-hpna.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-hpna.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/regs-wan.h
+ * arch/arm/mach-ks8695/include/mach/regs-wan.h
  *
  * Copyright (C) 2006 Andrew Victor
  *
diff --git a/include/asm-arm/arch-ks8695/regs-irq.h b/arch/arm/mach-ks8695/include/mach/regs-irq.h
index 70b193f6b756..352b7e8704d5 100644
--- a/include/asm-arm/arch-ks8695/regs-irq.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-irq.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/regs-irq.h
+ * arch/arm/mach-ks8695/include/mach/regs-irq.h
  *
  * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>
  * Copyright (C) 2006 Simtec Electronics
diff --git a/include/asm-arm/arch-ks8695/regs-lan.h b/arch/arm/mach-ks8695/include/mach/regs-lan.h
index a63bd61c64ed..9ef409901e76 100644
--- a/include/asm-arm/arch-ks8695/regs-lan.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-lan.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/regs-lan.h
+ * arch/arm/mach-ks8695/include/mach/regs-lan.h
  *
  * Copyright (C) 2006 Andrew Victor
  *
diff --git a/include/asm-arm/arch-ks8695/regs-mem.h b/arch/arm/mach-ks8695/include/mach/regs-mem.h
index 76b38e0862e6..55806bc68ce3 100644
--- a/include/asm-arm/arch-ks8695/regs-mem.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-mem.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/regs-mem.h
+ * arch/arm/mach-ks8695/include/mach/regs-mem.h
  *
  * Copyright (C) 2006 Andrew Victor
  *
diff --git a/include/asm-arm/arch-ks8695/regs-misc.h b/arch/arm/mach-ks8695/include/mach/regs-misc.h
index 632ca6601a94..2740c52494a0 100644
--- a/include/asm-arm/arch-ks8695/regs-misc.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-misc.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/regs-misc.h
+ * arch/arm/mach-ks8695/include/mach/regs-misc.h
  *
  * Copyright (C) 2006 Andrew Victor
  *
diff --git a/include/asm-arm/arch-ks8695/regs-pci.h b/arch/arm/mach-ks8695/include/mach/regs-pci.h
index 286d6d488df8..75a9db6edbd9 100644
--- a/include/asm-arm/arch-ks8695/regs-pci.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-pci.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/regs-pci.h
+ * arch/arm/mach-ks8695/include/mach/regs-pci.h
  *
  * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>
  * Copyright (C) 2006 Simtec Electronics
diff --git a/include/asm-arm/arch-ks8695/regs-switch.h b/arch/arm/mach-ks8695/include/mach/regs-switch.h
index 5f37be3f2f60..56d12e8de895 100644
--- a/include/asm-arm/arch-ks8695/regs-switch.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-switch.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/regs-switch.h
+ * arch/arm/mach-ks8695/include/mach/regs-switch.h
  *
  * Copyright (C) 2006 Andrew Victor
  *
diff --git a/include/asm-arm/arch-ks8695/regs-sys.h b/arch/arm/mach-ks8695/include/mach/regs-sys.h
index f3179815b8ee..57c20be0c129 100644
--- a/include/asm-arm/arch-ks8695/regs-sys.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-sys.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/regs-sys.h
+ * arch/arm/mach-ks8695/include/mach/regs-sys.h
  *
  * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>
  * Copyright (C) 2006 Simtec Electronics
diff --git a/include/asm-arm/arch-ks8695/regs-timer.h b/arch/arm/mach-ks8695/include/mach/regs-timer.h
index 0a9f7f99ec52..e620cda99d2d 100644
--- a/include/asm-arm/arch-ks8695/regs-timer.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-timer.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/regs-timer.h
+ * arch/arm/mach-ks8695/include/mach/regs-timer.h
  *
  * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>
  * Copyright (C) 2006 Simtec Electronics
diff --git a/include/asm-arm/arch-ks8695/regs-uart.h b/arch/arm/mach-ks8695/include/mach/regs-uart.h
index a27cb20502a3..8581fbc6245f 100644
--- a/include/asm-arm/arch-ks8695/regs-uart.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-uart.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-ks8695/regs-uart.h
+ * arch/arm/mach-ks8695/include/mach/regs-uart.h
  *
  * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>
  * Copyright (C) 2006 Simtec Electronics
diff --git a/include/asm-arm/arch-ks8695/regs-wan.h b/arch/arm/mach-ks8695/include/mach/regs-wan.h
index 52e35b0d65e4..eb494ec6e956 100644
--- a/include/asm-arm/arch-ks8695/regs-wan.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-wan.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/regs-wan.h
+ * arch/arm/mach-ks8695/include/mach/regs-wan.h
  *
  * Copyright (C) 2006 Andrew Victor
  *
diff --git a/include/asm-arm/arch-ks8695/system.h b/arch/arm/mach-ks8695/include/mach/system.h
index 3bc28106d937..2a6f91869056 100644
--- a/include/asm-arm/arch-ks8695/system.h
+++ b/arch/arm/mach-ks8695/include/mach/system.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-s3c2410/system.h
+ * arch/arm/mach-s3c2410/include/mach/system.h
  *
  * Copyright (C) 2006 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
@@ -15,7 +15,7 @@
 #define __ASM_ARCH_SYSTEM_H
 
 #include <asm/io.h>
-#include <asm/arch/regs-timer.h>
+#include <mach/regs-timer.h>
 
 static void arch_idle(void)
 {
diff --git a/include/asm-arm/arch-ks8695/timex.h b/arch/arm/mach-ks8695/include/mach/timex.h
index 8320d528b903..4682e350369b 100644
--- a/include/asm-arm/arch-ks8695/timex.h
+++ b/arch/arm/mach-ks8695/include/mach/timex.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/timex.h
+ * arch/arm/mach-ks8695/include/mach/timex.h
  *
  * Copyright (C) 2006 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-ks8695/uncompress.h b/arch/arm/mach-ks8695/include/mach/uncompress.h
index 733a50855b5d..0eee37a69075 100644
--- a/include/asm-arm/arch-ks8695/uncompress.h
+++ b/arch/arm/mach-ks8695/include/mach/uncompress.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/uncompress.h
+ * arch/arm/mach-ks8695/include/mach/uncompress.h
  *
  * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>
  * Copyright (C) 2006 Simtec Electronics
@@ -15,7 +15,7 @@
 #define __ASM_ARCH_UNCOMPRESS_H
 
 #include <asm/io.h>
-#include <asm/arch/regs-uart.h>
+#include <mach/regs-uart.h>
 
 static void putc(char c)
 {
diff --git a/include/asm-arm/arch-ks8695/vmalloc.h b/arch/arm/mach-ks8695/include/mach/vmalloc.h
index d1d88e58117d..744ac66be3a2 100644
--- a/include/asm-arm/arch-ks8695/vmalloc.h
+++ b/arch/arm/mach-ks8695/include/mach/vmalloc.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/vmalloc.h
+ * arch/arm/mach-ks8695/include/mach/vmalloc.h
  *
  * Copyright (C) 2006 Ben Dooks
  * Copyright (C) 2006 Simtec Electronics <linux@simtec.co.uk>