Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 5182/1: pxa: Fix pcm990 compilation [ARM] Fix explicit asm(-arm)?/arch-foo references [ARM] move include/asm-arm to arch/arm/include/asm [ARM] Remove explicit dependency for misc.o from compressed/Makefile [ARM] initrd: claim initrd memory exclusively [ARM] pxa: add support for L2 outer cache on XScale3 (attempt 2) [ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout [ARM] add Sascha Hauer as Freescale i.MX Maintainer [ARM] i.MX: add missing clock functions exports [ARM] i.MX: remove set_imx_fb_info() export [ARM] mx1ads: make mmc platform data available for modules [ARM] mx2: add missing Kconfig dependency
git-mirror · Aug 3, 2008 · 7e31aa1 · 7e31aa1
2 parents 071f492 + 9cb7117
commit 7e31aa1
Show file tree

Hide file tree

Showing 207 changed files with 349 additions and 167 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -502,6 +502,12 @@ L:	openezx-devel@lists.openezx.org (subscribers-only)
 W:	http://www.openezx.org/
 S:	Maintained
 
+ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
+P:	Sascha Hauer
+M:	kernel@pengutronix.de
+L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:	Maintained
+
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 P:	Lennert Buytenhek
 M:	kernel@wantstofly.org

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
@@ -112,6 +112,3 @@ $(obj)/font.c: $(FONTC)
 
 $(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config
 	@sed "$(SEDFLAGS)" < $< > $@
-
-$(obj)/misc.o: $(obj)/misc.c include/asm/arch/uncompress.h lib/inflate.c
-
diff --git a/include/asm-arm/Kbuild → arch/arm/include/asm/Kbuild b/include/asm-arm/Kbuild → arch/arm/include/asm/Kbuild
diff --git a/include/asm-arm/a.out-core.h → arch/arm/include/asm/a.out-core.h b/include/asm-arm/a.out-core.h → arch/arm/include/asm/a.out-core.h
diff --git a/include/asm-arm/a.out.h → arch/arm/include/asm/a.out.h b/include/asm-arm/a.out.h → arch/arm/include/asm/a.out.h
diff --git a/include/asm-arm/assembler.h → arch/arm/include/asm/assembler.h b/include/asm-arm/assembler.h → arch/arm/include/asm/assembler.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/assembler.h
+ *  arch/arm/include/asm/assembler.h
  *
  *  Copyright (C) 1996-2000 Russell King
  *

diff --git a/include/asm-arm/atomic.h → arch/arm/include/asm/atomic.h b/include/asm-arm/atomic.h → arch/arm/include/asm/atomic.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/atomic.h
+ *  arch/arm/include/asm/atomic.h
  *
  *  Copyright (C) 1996 Russell King.
  *  Copyright (C) 2002 Deep Blue Solutions Ltd.

diff --git a/include/asm-arm/auxvec.h → arch/arm/include/asm/auxvec.h b/include/asm-arm/auxvec.h → arch/arm/include/asm/auxvec.h
diff --git a/include/asm-arm/bitops.h → arch/arm/include/asm/bitops.h b/include/asm-arm/bitops.h → arch/arm/include/asm/bitops.h
diff --git a/include/asm-arm/bug.h → arch/arm/include/asm/bug.h b/include/asm-arm/bug.h → arch/arm/include/asm/bug.h
diff --git a/include/asm-arm/bugs.h → arch/arm/include/asm/bugs.h b/include/asm-arm/bugs.h → arch/arm/include/asm/bugs.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/bugs.h
+ *  arch/arm/include/asm/bugs.h
  *
  *  Copyright (C) 1995-2003 Russell King
  *

diff --git a/include/asm-arm/byteorder.h → arch/arm/include/asm/byteorder.h b/include/asm-arm/byteorder.h → arch/arm/include/asm/byteorder.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/byteorder.h
+ *  arch/arm/include/asm/byteorder.h
  *
  * ARM Endian-ness.  In little endian mode, the data bus is connected such
  * that byte accesses appear as:

diff --git a/include/asm-arm/cache.h → arch/arm/include/asm/cache.h b/include/asm-arm/cache.h → arch/arm/include/asm/cache.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/cache.h
+ *  arch/arm/include/asm/cache.h
  */
 #ifndef __ASMARM_CACHE_H
 #define __ASMARM_CACHE_H

diff --git a/include/asm-arm/cacheflush.h → arch/arm/include/asm/cacheflush.h b/include/asm-arm/cacheflush.h → arch/arm/include/asm/cacheflush.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/cacheflush.h
+ *  arch/arm/include/asm/cacheflush.h
  *
  *  Copyright (C) 1999-2002 Russell King
  *

diff --git a/include/asm-arm/checksum.h → arch/arm/include/asm/checksum.h b/include/asm-arm/checksum.h → arch/arm/include/asm/checksum.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/checksum.h
+ *  arch/arm/include/asm/checksum.h
  *
  * IP checksum routines
  *

diff --git a/include/asm-arm/cnt32_to_63.h → arch/arm/include/asm/cnt32_to_63.h b/include/asm-arm/cnt32_to_63.h → arch/arm/include/asm/cnt32_to_63.h
diff --git a/include/asm-arm/cpu-multi32.h → arch/arm/include/asm/cpu-multi32.h b/include/asm-arm/cpu-multi32.h → arch/arm/include/asm/cpu-multi32.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/cpu-multi32.h
+ *  arch/arm/include/asm/cpu-multi32.h
  *
  *  Copyright (C) 2000 Russell King
  *

diff --git a/include/asm-arm/cpu-single.h → arch/arm/include/asm/cpu-single.h b/include/asm-arm/cpu-single.h → arch/arm/include/asm/cpu-single.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/cpu-single.h
+ *  arch/arm/include/asm/cpu-single.h
  *
  *  Copyright (C) 2000 Russell King
  *

diff --git a/include/asm-arm/cpu.h → arch/arm/include/asm/cpu.h b/include/asm-arm/cpu.h → arch/arm/include/asm/cpu.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/cpu.h
+ *  arch/arm/include/asm/cpu.h
  *
  *  Copyright (C) 2004-2005 ARM Ltd.
  *

diff --git a/include/asm-arm/cputime.h → arch/arm/include/asm/cputime.h b/include/asm-arm/cputime.h → arch/arm/include/asm/cputime.h
diff --git a/include/asm-arm/current.h → arch/arm/include/asm/current.h b/include/asm-arm/current.h → arch/arm/include/asm/current.h
diff --git a/include/asm-arm/delay.h → arch/arm/include/asm/delay.h b/include/asm-arm/delay.h → arch/arm/include/asm/delay.h
diff --git a/include/asm-arm/device.h → arch/arm/include/asm/device.h b/include/asm-arm/device.h → arch/arm/include/asm/device.h
diff --git a/include/asm-arm/div64.h → arch/arm/include/asm/div64.h b/include/asm-arm/div64.h → arch/arm/include/asm/div64.h
diff --git a/include/asm-arm/dma-mapping.h → arch/arm/include/asm/dma-mapping.h b/include/asm-arm/dma-mapping.h → arch/arm/include/asm/dma-mapping.h
diff --git a/include/asm-arm/dma.h → arch/arm/include/asm/dma.h b/include/asm-arm/dma.h → arch/arm/include/asm/dma.h
diff --git a/include/asm-arm/domain.h → arch/arm/include/asm/domain.h b/include/asm-arm/domain.h → arch/arm/include/asm/domain.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/domain.h
+ *  arch/arm/include/asm/domain.h
  *
  *  Copyright (C) 1999 Russell King.
  *

diff --git a/include/asm-arm/ecard.h → arch/arm/include/asm/ecard.h b/include/asm-arm/ecard.h → arch/arm/include/asm/ecard.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/ecard.h
+ * arch/arm/include/asm/ecard.h
  *
  * definitions for expansion cards
  *

diff --git a/include/asm-arm/elf.h → arch/arm/include/asm/elf.h b/include/asm-arm/elf.h → arch/arm/include/asm/elf.h
diff --git a/include/asm-arm/emergency-restart.h → arch/arm/include/asm/emergency-restart.h b/include/asm-arm/emergency-restart.h → arch/arm/include/asm/emergency-restart.h
diff --git a/include/asm-arm/errno.h → arch/arm/include/asm/errno.h b/include/asm-arm/errno.h → arch/arm/include/asm/errno.h
diff --git a/include/asm-arm/fb.h → arch/arm/include/asm/fb.h b/include/asm-arm/fb.h → arch/arm/include/asm/fb.h
diff --git a/include/asm-arm/fcntl.h → arch/arm/include/asm/fcntl.h b/include/asm-arm/fcntl.h → arch/arm/include/asm/fcntl.h
diff --git a/include/asm-arm/fiq.h → arch/arm/include/asm/fiq.h b/include/asm-arm/fiq.h → arch/arm/include/asm/fiq.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/fiq.h
+ *  arch/arm/include/asm/fiq.h
  *
  * Support for FIQ on ARM architectures.
  * Written by Philip Blundell <philb@gnu.org>, 1998

diff --git a/include/asm-arm/flat.h → arch/arm/include/asm/flat.h b/include/asm-arm/flat.h → arch/arm/include/asm/flat.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/flat.h -- uClinux flat-format executables
+ * arch/arm/include/asm/flat.h -- uClinux flat-format executables
  */
 
 #ifndef __ARM_FLAT_H__

diff --git a/include/asm-arm/floppy.h → arch/arm/include/asm/floppy.h b/include/asm-arm/floppy.h → arch/arm/include/asm/floppy.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/floppy.h
+ *  arch/arm/include/asm/floppy.h
  *
  *  Copyright (C) 1996-2000 Russell King
  *

diff --git a/include/asm-arm/fpstate.h → arch/arm/include/asm/fpstate.h b/include/asm-arm/fpstate.h → arch/arm/include/asm/fpstate.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/fpstate.h
+ *  arch/arm/include/asm/fpstate.h
  *
  *  Copyright (C) 1995 Russell King
  *

diff --git a/include/asm-arm/ftrace.h → arch/arm/include/asm/ftrace.h b/include/asm-arm/ftrace.h → arch/arm/include/asm/ftrace.h
diff --git a/include/asm-arm/futex.h → arch/arm/include/asm/futex.h b/include/asm-arm/futex.h → arch/arm/include/asm/futex.h
diff --git a/include/asm-arm/glue.h → arch/arm/include/asm/glue.h b/include/asm-arm/glue.h → arch/arm/include/asm/glue.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/glue.h
+ *  arch/arm/include/asm/glue.h
  *
  *  Copyright (C) 1997-1999 Russell King
  *  Copyright (C) 2000-2002 Deep Blue Solutions Ltd.

diff --git a/include/asm-arm/gpio.h → arch/arm/include/asm/gpio.h b/include/asm-arm/gpio.h → arch/arm/include/asm/gpio.h
diff --git a/include/asm-arm/hardirq.h → arch/arm/include/asm/hardirq.h b/include/asm-arm/hardirq.h → arch/arm/include/asm/hardirq.h
diff --git a/include/asm-arm/hardware.h → arch/arm/include/asm/hardware.h b/include/asm-arm/hardware.h → arch/arm/include/asm/hardware.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware.h
+ *  arch/arm/include/asm/hardware.h
  *
  *  Copyright (C) 1996 Russell King
  *

diff --git a/include/asm-arm/hardware/arm_timer.h → arch/arm/include/asm/hardware/arm_timer.h b/include/asm-arm/hardware/arm_timer.h → arch/arm/include/asm/hardware/arm_timer.h
diff --git a/include/asm-arm/hardware/arm_twd.h → arch/arm/include/asm/hardware/arm_twd.h b/include/asm-arm/hardware/arm_twd.h → arch/arm/include/asm/hardware/arm_twd.h
diff --git a/include/asm-arm/hardware/cache-l2x0.h → arch/arm/include/asm/hardware/cache-l2x0.h b/include/asm-arm/hardware/cache-l2x0.h → arch/arm/include/asm/hardware/cache-l2x0.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/hardware/cache-l2x0.h
+ * arch/arm/include/asm/hardware/cache-l2x0.h
  *
  * Copyright (C) 2007 ARM Limited
  *

diff --git a/include/asm-arm/hardware/clps7111.h → arch/arm/include/asm/hardware/clps7111.h b/include/asm-arm/hardware/clps7111.h → arch/arm/include/asm/hardware/clps7111.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/clps7111.h
+ *  arch/arm/include/asm/hardware/clps7111.h
  *
  *  This file contains the hardware definitions of the CLPS7111 internal
  *  registers.

diff --git a/include/asm-arm/hardware/cs89712.h → arch/arm/include/asm/hardware/cs89712.h b/include/asm-arm/hardware/cs89712.h → arch/arm/include/asm/hardware/cs89712.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/cs89712.h
+ *  arch/arm/include/asm/hardware/cs89712.h
  *
  *  This file contains the hardware definitions of the CS89712
  *  additional internal registers.

diff --git a/include/asm-arm/hardware/debug-8250.S → arch/arm/include/asm/hardware/debug-8250.S b/include/asm-arm/hardware/debug-8250.S → arch/arm/include/asm/hardware/debug-8250.S
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/hardware/debug-8250.S
+ * arch/arm/include/asm/hardware/debug-8250.S
  *
  *  Copyright (C) 1994-1999 Russell King
  *

diff --git a/include/asm-arm/hardware/debug-pl01x.S → arch/arm/include/asm/hardware/debug-pl01x.S b/include/asm-arm/hardware/debug-pl01x.S → arch/arm/include/asm/hardware/debug-pl01x.S
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/hardware/debug-pl01x.S
+/* arch/arm/include/asm/hardware/debug-pl01x.S
  *
  * Debugging macro include header
  *

diff --git a/include/asm-arm/hardware/dec21285.h → arch/arm/include/asm/hardware/dec21285.h b/include/asm-arm/hardware/dec21285.h → arch/arm/include/asm/hardware/dec21285.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/dec21285.h
+ *  arch/arm/include/asm/hardware/dec21285.h
  *
  *  Copyright (C) 1998 Russell King
  *

diff --git a/include/asm-arm/hardware/entry-macro-iomd.S → ...m/include/asm/hardware/entry-macro-iomd.S b/include/asm-arm/hardware/entry-macro-iomd.S → ...m/include/asm/hardware/entry-macro-iomd.S
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/hardware/entry-macro-iomd.S
+ * arch/arm/include/asm/hardware/entry-macro-iomd.S
  *
  * Low-level IRQ helper macros for IOC/IOMD based platforms
  *

diff --git a/include/asm-arm/hardware/ep7211.h → arch/arm/include/asm/hardware/ep7211.h b/include/asm-arm/hardware/ep7211.h → arch/arm/include/asm/hardware/ep7211.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/ep7211.h
+ *  arch/arm/include/asm/hardware/ep7211.h
  *
  *  This file contains the hardware definitions of the EP7211 internal
  *  registers.

diff --git a/include/asm-arm/hardware/ep7212.h → arch/arm/include/asm/hardware/ep7212.h b/include/asm-arm/hardware/ep7212.h → arch/arm/include/asm/hardware/ep7212.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/ep7212.h
+ *  arch/arm/include/asm/hardware/ep7212.h
  *
  *  This file contains the hardware definitions of the EP7212 internal
  *  registers.

diff --git a/include/asm-arm/hardware/gic.h → arch/arm/include/asm/hardware/gic.h b/include/asm-arm/hardware/gic.h → arch/arm/include/asm/hardware/gic.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/gic.h
+ *  arch/arm/include/asm/hardware/gic.h
  *
  *  Copyright (C) 2002 ARM Limited, All Rights Reserved.
  *

diff --git a/include/asm-arm/hardware/icst307.h → arch/arm/include/asm/hardware/icst307.h b/include/asm-arm/hardware/icst307.h → arch/arm/include/asm/hardware/icst307.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/icst307.h
+ *  arch/arm/include/asm/hardware/icst307.h
  *
  *  Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.
  *

diff --git a/include/asm-arm/hardware/icst525.h → arch/arm/include/asm/hardware/icst525.h b/include/asm-arm/hardware/icst525.h → arch/arm/include/asm/hardware/icst525.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/icst525.h
+ *  arch/arm/include/asm/hardware/icst525.h
  *
  *  Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.
  *

diff --git a/include/asm-arm/hardware/ioc.h → arch/arm/include/asm/hardware/ioc.h b/include/asm-arm/hardware/ioc.h → arch/arm/include/asm/hardware/ioc.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/ioc.h
+ *  arch/arm/include/asm/hardware/ioc.h
  *
  *  Copyright (C) Russell King
  *

diff --git a/include/asm-arm/hardware/iomd.h → arch/arm/include/asm/hardware/iomd.h b/include/asm-arm/hardware/iomd.h → arch/arm/include/asm/hardware/iomd.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/iomd.h
+ *  arch/arm/include/asm/hardware/iomd.h
  *
  *  Copyright (C) 1999 Russell King
  *

diff --git a/include/asm-arm/hardware/iop3xx-adma.h → arch/arm/include/asm/hardware/iop3xx-adma.h b/include/asm-arm/hardware/iop3xx-adma.h → arch/arm/include/asm/hardware/iop3xx-adma.h
diff --git a/include/asm-arm/hardware/iop3xx-gpio.h → arch/arm/include/asm/hardware/iop3xx-gpio.h b/include/asm-arm/hardware/iop3xx-gpio.h → arch/arm/include/asm/hardware/iop3xx-gpio.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/hardware/iop3xx-gpio.h
+ * arch/arm/include/asm/hardware/iop3xx-gpio.h
  *
  * IOP3xx GPIO wrappers
  *

diff --git a/include/asm-arm/hardware/iop3xx.h → arch/arm/include/asm/hardware/iop3xx.h b/include/asm-arm/hardware/iop3xx.h → arch/arm/include/asm/hardware/iop3xx.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/hardware/iop3xx.h
+ * arch/arm/include/asm/hardware/iop3xx.h
  *
  * Intel IOP32X and IOP33X register definitions
  *

diff --git a/include/asm-arm/hardware/iop_adma.h → arch/arm/include/asm/hardware/iop_adma.h b/include/asm-arm/hardware/iop_adma.h → arch/arm/include/asm/hardware/iop_adma.h
diff --git a/include/asm-arm/hardware/it8152.h → arch/arm/include/asm/hardware/it8152.h b/include/asm-arm/hardware/it8152.h → arch/arm/include/asm/hardware/it8152.h
diff --git a/include/asm-arm/hardware/linkup-l1110.h → arch/arm/include/asm/hardware/linkup-l1110.h b/include/asm-arm/hardware/linkup-l1110.h → arch/arm/include/asm/hardware/linkup-l1110.h
diff --git a/include/asm-arm/hardware/locomo.h → arch/arm/include/asm/hardware/locomo.h b/include/asm-arm/hardware/locomo.h → arch/arm/include/asm/hardware/locomo.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/hardware/locomo.h
+ * arch/arm/include/asm/hardware/locomo.h
  *
  * This file contains the definitions for the LoCoMo G/A Chip
  *

diff --git a/include/asm-arm/hardware/memc.h → arch/arm/include/asm/hardware/memc.h b/include/asm-arm/hardware/memc.h → arch/arm/include/asm/hardware/memc.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/memc.h
+ *  arch/arm/include/asm/hardware/memc.h
  *
  *  Copyright (C) Russell King.
  *

diff --git a/include/asm-arm/hardware/pci_v3.h → arch/arm/include/asm/hardware/pci_v3.h b/include/asm-arm/hardware/pci_v3.h → arch/arm/include/asm/hardware/pci_v3.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/pci_v3.h
+ *  arch/arm/include/asm/hardware/pci_v3.h
  *
  *  Internal header file PCI V3 chip
  *

diff --git a/include/asm-arm/hardware/sa1111.h → arch/arm/include/asm/hardware/sa1111.h b/include/asm-arm/hardware/sa1111.h → arch/arm/include/asm/hardware/sa1111.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/hardware/sa1111.h
+ * arch/arm/include/asm/hardware/sa1111.h
  *
  * Copyright (C) 2000 John G Dorsey <john+@cs.cmu.edu>
  *

diff --git a/include/asm-arm/hardware/scoop.h → arch/arm/include/asm/hardware/scoop.h b/include/asm-arm/hardware/scoop.h → arch/arm/include/asm/hardware/scoop.h
diff --git a/include/asm-arm/hardware/sharpsl_pm.h → arch/arm/include/asm/hardware/sharpsl_pm.h b/include/asm-arm/hardware/sharpsl_pm.h → arch/arm/include/asm/hardware/sharpsl_pm.h
diff --git a/include/asm-arm/hardware/ssp.h → arch/arm/include/asm/hardware/ssp.h b/include/asm-arm/hardware/ssp.h → arch/arm/include/asm/hardware/ssp.h
diff --git a/include/asm-arm/hardware/uengine.h → arch/arm/include/asm/hardware/uengine.h b/include/asm-arm/hardware/uengine.h → arch/arm/include/asm/hardware/uengine.h
diff --git a/include/asm-arm/hardware/vic.h → arch/arm/include/asm/hardware/vic.h b/include/asm-arm/hardware/vic.h → arch/arm/include/asm/hardware/vic.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/vic.h
+ *  arch/arm/include/asm/hardware/vic.h
  *
  *  Copyright (c) ARM Limited 2003.  All rights reserved.
  *

diff --git a/include/asm-arm/hw_irq.h → arch/arm/include/asm/hw_irq.h b/include/asm-arm/hw_irq.h → arch/arm/include/asm/hw_irq.h
diff --git a/include/asm-arm/hwcap.h → arch/arm/include/asm/hwcap.h b/include/asm-arm/hwcap.h → arch/arm/include/asm/hwcap.h
diff --git a/include/asm-arm/ide.h → arch/arm/include/asm/ide.h b/include/asm-arm/ide.h → arch/arm/include/asm/ide.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/ide.h
+ *  arch/arm/include/asm/ide.h
  *
  *  Copyright (C) 1994-1996  Linus Torvalds & authors
  */

diff --git a/include/asm-arm/io.h → arch/arm/include/asm/io.h b/include/asm-arm/io.h → arch/arm/include/asm/io.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/io.h
+ *  arch/arm/include/asm/io.h
  *
  *  Copyright (C) 1996-2000 Russell King
  *

diff --git a/include/asm-arm/ioctl.h → arch/arm/include/asm/ioctl.h b/include/asm-arm/ioctl.h → arch/arm/include/asm/ioctl.h
diff --git a/include/asm-arm/ioctls.h → arch/arm/include/asm/ioctls.h b/include/asm-arm/ioctls.h → arch/arm/include/asm/ioctls.h
diff --git a/include/asm-arm/ipcbuf.h → arch/arm/include/asm/ipcbuf.h b/include/asm-arm/ipcbuf.h → arch/arm/include/asm/ipcbuf.h
diff --git a/include/asm-arm/irq.h → arch/arm/include/asm/irq.h b/include/asm-arm/irq.h → arch/arm/include/asm/irq.h
diff --git a/include/asm-arm/irq_regs.h → arch/arm/include/asm/irq_regs.h b/include/asm-arm/irq_regs.h → arch/arm/include/asm/irq_regs.h
diff --git a/include/asm-arm/irqflags.h → arch/arm/include/asm/irqflags.h b/include/asm-arm/irqflags.h → arch/arm/include/asm/irqflags.h
diff --git a/include/asm-arm/kdebug.h → arch/arm/include/asm/kdebug.h b/include/asm-arm/kdebug.h → arch/arm/include/asm/kdebug.h
diff --git a/include/asm-arm/kexec.h → arch/arm/include/asm/kexec.h b/include/asm-arm/kexec.h → arch/arm/include/asm/kexec.h
diff --git a/include/asm-arm/kgdb.h → arch/arm/include/asm/kgdb.h b/include/asm-arm/kgdb.h → arch/arm/include/asm/kgdb.h
diff --git a/include/asm-arm/kmap_types.h → arch/arm/include/asm/kmap_types.h b/include/asm-arm/kmap_types.h → arch/arm/include/asm/kmap_types.h
diff --git a/include/asm-arm/kprobes.h → arch/arm/include/asm/kprobes.h b/include/asm-arm/kprobes.h → arch/arm/include/asm/kprobes.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/kprobes.h
+ * arch/arm/include/asm/kprobes.h
  *
  * Copyright (C) 2006, 2007 Motorola Inc.
  *

diff --git a/include/asm-arm/leds.h → arch/arm/include/asm/leds.h b/include/asm-arm/leds.h → arch/arm/include/asm/leds.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/leds.h
+ *  arch/arm/include/asm/leds.h
  *
  *  Copyright (C) 1998 Russell King
  *

diff --git a/include/asm-arm/limits.h → arch/arm/include/asm/limits.h b/include/asm-arm/limits.h → arch/arm/include/asm/limits.h
diff --git a/include/asm-arm/linkage.h → arch/arm/include/asm/linkage.h b/include/asm-arm/linkage.h → arch/arm/include/asm/linkage.h
diff --git a/include/asm-arm/local.h → arch/arm/include/asm/local.h b/include/asm-arm/local.h → arch/arm/include/asm/local.h
diff --git a/include/asm-arm/locks.h → arch/arm/include/asm/locks.h b/include/asm-arm/locks.h → arch/arm/include/asm/locks.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/locks.h
+ *  arch/arm/include/asm/locks.h
  *
  *  Copyright (C) 2000 Russell King
  *

diff --git a/include/asm-arm/mach/arch.h → arch/arm/include/asm/mach/arch.h b/include/asm-arm/mach/arch.h → arch/arm/include/asm/mach/arch.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mach/arch.h
+ *  arch/arm/include/asm/mach/arch.h
  *
  *  Copyright (C) 2000 Russell King
  *

diff --git a/include/asm-arm/mach/dma.h → arch/arm/include/asm/mach/dma.h b/include/asm-arm/mach/dma.h → arch/arm/include/asm/mach/dma.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mach/dma.h
+ *  arch/arm/include/asm/mach/dma.h
  *
  *  Copyright (C) 1998-2000 Russell King
  *

diff --git a/include/asm-arm/mach/flash.h → arch/arm/include/asm/mach/flash.h b/include/asm-arm/mach/flash.h → arch/arm/include/asm/mach/flash.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mach/flash.h
+ *  arch/arm/include/asm/mach/flash.h
  *
  *  Copyright (C) 2003 Russell King, All Rights Reserved.
  *

diff --git a/include/asm-arm/mach/irda.h → arch/arm/include/asm/mach/irda.h b/include/asm-arm/mach/irda.h → arch/arm/include/asm/mach/irda.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mach/irda.h
+ *  arch/arm/include/asm/mach/irda.h
  *
  *  Copyright (C) 2004 Russell King.
  *

diff --git a/include/asm-arm/mach/irq.h → arch/arm/include/asm/mach/irq.h b/include/asm-arm/mach/irq.h → arch/arm/include/asm/mach/irq.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mach/irq.h
+ *  arch/arm/include/asm/mach/irq.h
  *
  *  Copyright (C) 1995-2000 Russell King.
  *

diff --git a/include/asm-arm/mach/map.h → arch/arm/include/asm/mach/map.h b/include/asm-arm/mach/map.h → arch/arm/include/asm/mach/map.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/map.h
+ *  arch/arm/include/asm/map.h
  *
  *  Copyright (C) 1999-2000 Russell King
  *

diff --git a/include/asm-arm/mach/mmc.h → arch/arm/include/asm/mach/mmc.h b/include/asm-arm/mach/mmc.h → arch/arm/include/asm/mach/mmc.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mach/mmc.h
+ *  arch/arm/include/asm/mach/mmc.h
  */
 #ifndef ASMARM_MACH_MMC_H
 #define ASMARM_MACH_MMC_H

diff --git a/include/asm-arm/mach/pci.h → arch/arm/include/asm/mach/pci.h b/include/asm-arm/mach/pci.h → arch/arm/include/asm/mach/pci.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mach/pci.h
+ *  arch/arm/include/asm/mach/pci.h
  *
  *  Copyright (C) 2000 Russell King
  *

diff --git a/include/asm-arm/mach/serial_at91.h → arch/arm/include/asm/mach/serial_at91.h b/include/asm-arm/mach/serial_at91.h → arch/arm/include/asm/mach/serial_at91.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mach/serial_at91.h
+ *  arch/arm/include/asm/mach/serial_at91.h
  *
  *  Based on serial_sa1100.h  by Nicolas Pitre
  *
Original file line number	Diff line number	Diff line change
Expand Up		@@ -112,6 +112,3 @@ $(obj)/font.c: $(FONTC)

		$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config
		@sed "$(SEDFLAGS)" < $< > $@

		$(obj)/misc.o: $(obj)/misc.c include/asm/arch/uncompress.h lib/inflate.c