11 files changed, 16 insertions, 16 deletions
diff --git a/include/asm-arm/arch-ebsa285/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S
index b48cec4a0c45..4329b8123570 100644
--- a/include/asm-arm/arch-ebsa285/debug-macro.S
+++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-ebsa285/debug-macro.S
+/* arch/arm/mach-footbridge/include/mach/debug-macro.S
  *
  * Debugging macro include header
  *
diff --git a/include/asm-arm/arch-ebsa285/dma.h b/arch/arm/mach-footbridge/include/mach/dma.h
index 0259ad45d33c..62afd213effb 100644
--- a/include/asm-arm/arch-ebsa285/dma.h
+++ b/arch/arm/mach-footbridge/include/mach/dma.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-ebsa285/dma.h
+ *  arch/arm/mach-footbridge/include/mach/dma.h
  *
  *  Architecture DMA routines
  *
diff --git a/include/asm-arm/arch-ebsa285/entry-macro.S b/arch/arm/mach-footbridge/include/mach/entry-macro.S
index e203c628d500..d3847be0c667 100644
--- a/include/asm-arm/arch-ebsa285/entry-macro.S
+++ b/arch/arm/mach-footbridge/include/mach/entry-macro.S
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ebsa285/entry-macro.S
+ * arch/arm/mach-footbridge/include/mach/entry-macro.S
  *
  * Low-level IRQ helper macros for footbridge-based platforms
  *
@@ -7,8 +7,8 @@
  * License version 2. This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
-#include <asm/arch/hardware.h>
-#include <asm/arch/irqs.h>
+#include <mach/hardware.h>
+#include <mach/irqs.h>
 #include <asm/hardware/dec21285.h>
 
 		.equ	dc21285_high, ARMCSR_BASE & 0xff000000
diff --git a/include/asm-arm/arch-ebsa285/hardware.h b/arch/arm/mach-footbridge/include/mach/hardware.h
index 74610c2c63d4..ffaea90486f9 100644
--- a/include/asm-arm/arch-ebsa285/hardware.h
+++ b/arch/arm/mach-footbridge/include/mach/hardware.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-ebsa285/hardware.h
+ *  arch/arm/mach-footbridge/include/mach/hardware.h
  *
  *  Copyright (C) 1998-1999 Russell King.
  *
@@ -12,7 +12,7 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <asm/arch/memory.h>
+#include <mach/memory.h>
 
 /*   Virtual      Physical	Size
  * 0xff800000	0x40000000	1MB	X-Bus
diff --git a/include/asm-arm/arch-ebsa285/io.h b/arch/arm/mach-footbridge/include/mach/io.h
index e88c6e230387..a7b066239996 100644
--- a/include/asm-arm/arch-ebsa285/io.h
+++ b/arch/arm/mach-footbridge/include/mach/io.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-ebsa285/io.h
+ *  arch/arm/mach-footbridge/include/mach/io.h
  *
  *  Copyright (C) 1997-1999 Russell King
  *
@@ -14,7 +14,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 0xffff
 
diff --git a/include/asm-arm/arch-ebsa285/irqs.h b/arch/arm/mach-footbridge/include/mach/irqs.h
index 3e766f1cecf1..400551e43e4e 100644
--- a/include/asm-arm/arch-ebsa285/irqs.h
+++ b/arch/arm/mach-footbridge/include/mach/irqs.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-ebsa285/irqs.h
+ * arch/arm/mach-footbridge/include/mach/irqs.h
  *
  * Copyright (C) 1998 Russell King
  * Copyright (C) 1998 Phil Blundell
diff --git a/include/asm-arm/arch-ebsa285/memory.h b/arch/arm/mach-footbridge/include/mach/memory.h
index 9019a3bf5ab9..e9cae99dd1f9 100644
--- a/include/asm-arm/arch-ebsa285/memory.h
+++ b/arch/arm/mach-footbridge/include/mach/memory.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-ebsa285/memory.h
+ *  arch/arm/mach-footbridge/include/mach/memory.h
  *
  *  Copyright (C) 1996-1999 Russell King.
  *
diff --git a/include/asm-arm/arch-ebsa285/system.h b/arch/arm/mach-footbridge/include/mach/system.h
index a720bf7ca123..01c9f407f498 100644
--- a/include/asm-arm/arch-ebsa285/system.h
+++ b/arch/arm/mach-footbridge/include/mach/system.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-ebsa285/system.h
+ *  arch/arm/mach-footbridge/include/mach/system.h
  *
  *  Copyright (C) 1996-1999 Russell King.
  *
@@ -9,7 +9,7 @@
  */
 #include <asm/hardware/dec21285.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/mach-types.h>
 
diff --git a/include/asm-arm/arch-ebsa285/timex.h b/arch/arm/mach-footbridge/include/mach/timex.h
index df60b3812d96..d0fea9d6d4ab 100644
--- a/include/asm-arm/arch-ebsa285/timex.h
+++ b/arch/arm/mach-footbridge/include/mach/timex.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-ebsa285/timex.h
+ *  arch/arm/mach-footbridge/include/mach/timex.h
  *
  *  Copyright (C) 1998 Russell King
  *
diff --git a/include/asm-arm/arch-ebsa285/uncompress.h b/arch/arm/mach-footbridge/include/mach/uncompress.h
index 86142c882b3a..5dfa44287346 100644
--- a/include/asm-arm/arch-ebsa285/uncompress.h
+++ b/arch/arm/mach-footbridge/include/mach/uncompress.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-ebsa285/uncompress.h
+ *  arch/arm/mach-footbridge/include/mach/uncompress.h
  *
  *  Copyright (C) 1996-1999 Russell King
  *
diff --git a/include/asm-arm/arch-ebsa285/vmalloc.h b/arch/arm/mach-footbridge/include/mach/vmalloc.h
index e487d7e8c8a6..d0958d860a3c 100644
--- a/include/asm-arm/arch-ebsa285/vmalloc.h
+++ b/arch/arm/mach-footbridge/include/mach/vmalloc.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-ebsa285/vmalloc.h
+ *  arch/arm/mach-footbridge/include/mach/vmalloc.h
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as