[ARM] move include/asm-arm to arch/arm/include/asm
Russell King [Sat, 2 Aug 2008 09:55:55 +0000 (10:55 +0100)]
Move platform independent header files to arch/arm/include/asm, leaving
those in asm/arch* and asm/plat* alone.

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

182 files changed:
arch/arm/include/asm/Kbuild [moved from include/asm-arm/Kbuild with 100% similarity]
arch/arm/include/asm/a.out-core.h [moved from include/asm-arm/a.out-core.h with 100% similarity]
arch/arm/include/asm/a.out.h [moved from include/asm-arm/a.out.h with 100% similarity]
arch/arm/include/asm/assembler.h [moved from include/asm-arm/assembler.h with 98% similarity]
arch/arm/include/asm/atomic.h [moved from include/asm-arm/atomic.h with 99% similarity]
arch/arm/include/asm/auxvec.h [moved from include/asm-arm/auxvec.h with 100% similarity]
arch/arm/include/asm/bitops.h [moved from include/asm-arm/bitops.h with 100% similarity]
arch/arm/include/asm/bug.h [moved from include/asm-arm/bug.h with 100% similarity]
arch/arm/include/asm/bugs.h [moved from include/asm-arm/bugs.h with 93% similarity]
arch/arm/include/asm/byteorder.h [moved from include/asm-arm/byteorder.h with 97% similarity]
arch/arm/include/asm/cache.h [moved from include/asm-arm/cache.h with 80% similarity]
arch/arm/include/asm/cacheflush.h [moved from include/asm-arm/cacheflush.h with 99% similarity]
arch/arm/include/asm/checksum.h [moved from include/asm-arm/checksum.h with 98% similarity]
arch/arm/include/asm/cnt32_to_63.h [moved from include/asm-arm/cnt32_to_63.h with 100% similarity]
arch/arm/include/asm/cpu-multi32.h [moved from include/asm-arm/cpu-multi32.h with 97% similarity]
arch/arm/include/asm/cpu-single.h [moved from include/asm-arm/cpu-single.h with 97% similarity]
arch/arm/include/asm/cpu.h [moved from include/asm-arm/cpu.h with 93% similarity]
arch/arm/include/asm/cputime.h [moved from include/asm-arm/cputime.h with 100% similarity]
arch/arm/include/asm/current.h [moved from include/asm-arm/current.h with 100% similarity]
arch/arm/include/asm/delay.h [moved from include/asm-arm/delay.h with 100% similarity]
arch/arm/include/asm/device.h [moved from include/asm-arm/device.h with 100% similarity]
arch/arm/include/asm/div64.h [moved from include/asm-arm/div64.h with 100% similarity]
arch/arm/include/asm/dma-mapping.h [moved from include/asm-arm/dma-mapping.h with 100% similarity]
arch/arm/include/asm/dma.h [moved from include/asm-arm/dma.h with 100% similarity]
arch/arm/include/asm/domain.h [moved from include/asm-arm/domain.h with 98% similarity]
arch/arm/include/asm/ecard.h [moved from include/asm-arm/ecard.h with 99% similarity]
arch/arm/include/asm/elf.h [moved from include/asm-arm/elf.h with 100% similarity]
arch/arm/include/asm/emergency-restart.h [moved from include/asm-arm/emergency-restart.h with 100% similarity]
arch/arm/include/asm/errno.h [moved from include/asm-arm/errno.h with 100% similarity]
arch/arm/include/asm/fb.h [moved from include/asm-arm/fb.h with 100% similarity]
arch/arm/include/asm/fcntl.h [moved from include/asm-arm/fcntl.h with 100% similarity]
arch/arm/include/asm/fiq.h [moved from include/asm-arm/fiq.h with 96% similarity]
arch/arm/include/asm/flat.h [moved from include/asm-arm/flat.h with 90% similarity]
arch/arm/include/asm/floppy.h [moved from include/asm-arm/floppy.h with 99% similarity]
arch/arm/include/asm/fpstate.h [moved from include/asm-arm/fpstate.h with 97% similarity]
arch/arm/include/asm/ftrace.h [moved from include/asm-arm/ftrace.h with 100% similarity]
arch/arm/include/asm/futex.h [moved from include/asm-arm/futex.h with 100% similarity]
arch/arm/include/asm/glue.h [moved from include/asm-arm/glue.h with 99% similarity]
arch/arm/include/asm/gpio.h [moved from include/asm-arm/gpio.h with 100% similarity]
arch/arm/include/asm/hardirq.h [moved from include/asm-arm/hardirq.h with 100% similarity]
arch/arm/include/asm/hardware.h [moved from include/asm-arm/hardware.h with 90% similarity]
arch/arm/include/asm/hardware/arm_timer.h [moved from include/asm-arm/hardware/arm_timer.h with 100% similarity]
arch/arm/include/asm/hardware/arm_twd.h [moved from include/asm-arm/hardware/arm_twd.h with 100% similarity]
arch/arm/include/asm/hardware/cache-l2x0.h [moved from include/asm-arm/hardware/cache-l2x0.h with 97% similarity]
arch/arm/include/asm/hardware/clps7111.h [moved from include/asm-arm/hardware/clps7111.h with 99% similarity]
arch/arm/include/asm/hardware/cs89712.h [moved from include/asm-arm/hardware/cs89712.h with 97% similarity]
arch/arm/include/asm/hardware/debug-8250.S [moved from include/asm-arm/hardware/debug-8250.S with 93% similarity]
arch/arm/include/asm/hardware/debug-pl01x.S [moved from include/asm-arm/hardware/debug-pl01x.S with 93% similarity]
arch/arm/include/asm/hardware/dec21285.h [moved from include/asm-arm/hardware/dec21285.h with 99% similarity]
arch/arm/include/asm/hardware/entry-macro-iomd.S [moved from include/asm-arm/hardware/entry-macro-iomd.S with 99% similarity]
arch/arm/include/asm/hardware/ep7211.h [moved from include/asm-arm/hardware/ep7211.h with 96% similarity]
arch/arm/include/asm/hardware/ep7212.h [moved from include/asm-arm/hardware/ep7212.h with 98% similarity]
arch/arm/include/asm/hardware/gic.h [moved from include/asm-arm/hardware/gic.h with 96% similarity]
arch/arm/include/asm/hardware/icst307.h [moved from include/asm-arm/hardware/icst307.h with 96% similarity]
arch/arm/include/asm/hardware/icst525.h [moved from include/asm-arm/hardware/icst525.h with 96% similarity]
arch/arm/include/asm/hardware/ioc.h [moved from include/asm-arm/hardware/ioc.h with 97% similarity]
arch/arm/include/asm/hardware/iomd.h [moved from include/asm-arm/hardware/iomd.h with 99% similarity]
arch/arm/include/asm/hardware/iop3xx-adma.h [moved from include/asm-arm/hardware/iop3xx-adma.h with 100% similarity]
arch/arm/include/asm/hardware/iop3xx-gpio.h [moved from include/asm-arm/hardware/iop3xx-gpio.h with 97% similarity]
arch/arm/include/asm/hardware/iop3xx.h [moved from include/asm-arm/hardware/iop3xx.h with 99% similarity]
arch/arm/include/asm/hardware/iop_adma.h [moved from include/asm-arm/hardware/iop_adma.h with 100% similarity]
arch/arm/include/asm/hardware/it8152.h [moved from include/asm-arm/hardware/it8152.h with 100% similarity]
arch/arm/include/asm/hardware/linkup-l1110.h [moved from include/asm-arm/hardware/linkup-l1110.h with 100% similarity]
arch/arm/include/asm/hardware/locomo.h [moved from include/asm-arm/hardware/locomo.h with 99% similarity]
arch/arm/include/asm/hardware/memc.h [moved from include/asm-arm/hardware/memc.h with 93% similarity]
arch/arm/include/asm/hardware/pci_v3.h [moved from include/asm-arm/hardware/pci_v3.h with 99% similarity]
arch/arm/include/asm/hardware/sa1111.h [moved from include/asm-arm/hardware/sa1111.h with 99% similarity]
arch/arm/include/asm/hardware/scoop.h [moved from include/asm-arm/hardware/scoop.h with 100% similarity]
arch/arm/include/asm/hardware/sharpsl_pm.h [moved from include/asm-arm/hardware/sharpsl_pm.h with 100% similarity]
arch/arm/include/asm/hardware/ssp.h [moved from include/asm-arm/hardware/ssp.h with 100% similarity]
arch/arm/include/asm/hardware/uengine.h [moved from include/asm-arm/hardware/uengine.h with 100% similarity]
arch/arm/include/asm/hardware/vic.h [moved from include/asm-arm/hardware/vic.h with 97% similarity]
arch/arm/include/asm/hw_irq.h [moved from include/asm-arm/hw_irq.h with 100% similarity]
arch/arm/include/asm/hwcap.h [moved from include/asm-arm/hwcap.h with 100% similarity]
arch/arm/include/asm/ide.h [moved from include/asm-arm/ide.h with 93% similarity]
arch/arm/include/asm/io.h [moved from include/asm-arm/io.h with 99% similarity]
arch/arm/include/asm/ioctl.h [moved from include/asm-arm/ioctl.h with 100% similarity]
arch/arm/include/asm/ioctls.h [moved from include/asm-arm/ioctls.h with 100% similarity]
arch/arm/include/asm/ipcbuf.h [moved from include/asm-arm/ipcbuf.h with 100% similarity]
arch/arm/include/asm/irq.h [moved from include/asm-arm/irq.h with 100% similarity]
arch/arm/include/asm/irq_regs.h [moved from include/asm-arm/irq_regs.h with 100% similarity]
arch/arm/include/asm/irqflags.h [moved from include/asm-arm/irqflags.h with 100% similarity]
arch/arm/include/asm/kdebug.h [moved from include/asm-arm/kdebug.h with 100% similarity]
arch/arm/include/asm/kexec.h [moved from include/asm-arm/kexec.h with 100% similarity]
arch/arm/include/asm/kgdb.h [moved from include/asm-arm/kgdb.h with 100% similarity]
arch/arm/include/asm/kmap_types.h [moved from include/asm-arm/kmap_types.h with 100% similarity]
arch/arm/include/asm/kprobes.h [moved from include/asm-arm/kprobes.h with 98% similarity]
arch/arm/include/asm/leds.h [moved from include/asm-arm/leds.h with 96% similarity]
arch/arm/include/asm/limits.h [moved from include/asm-arm/limits.h with 100% similarity]
arch/arm/include/asm/linkage.h [moved from include/asm-arm/linkage.h with 100% similarity]
arch/arm/include/asm/local.h [moved from include/asm-arm/local.h with 100% similarity]
arch/arm/include/asm/locks.h [moved from include/asm-arm/locks.h with 99% similarity]
arch/arm/include/asm/mach/arch.h [moved from include/asm-arm/mach/arch.h with 97% similarity]
arch/arm/include/asm/mach/dma.h [moved from include/asm-arm/mach/dma.h with 97% similarity]
arch/arm/include/asm/mach/flash.h [moved from include/asm-arm/mach/flash.h with 96% similarity]
arch/arm/include/asm/mach/irda.h [moved from include/asm-arm/mach/irda.h with 93% similarity]
arch/arm/include/asm/mach/irq.h [moved from include/asm-arm/mach/irq.h with 96% similarity]
arch/arm/include/asm/mach/map.h [moved from include/asm-arm/mach/map.h with 96% similarity]
arch/arm/include/asm/mach/mmc.h [moved from include/asm-arm/mach/mmc.h with 88% similarity]
arch/arm/include/asm/mach/pci.h [moved from include/asm-arm/mach/pci.h with 98% similarity]
arch/arm/include/asm/mach/serial_at91.h [moved from include/asm-arm/mach/serial_at91.h with 94% similarity]
arch/arm/include/asm/mach/serial_sa1100.h [moved from include/asm-arm/mach/serial_sa1100.h with 86% similarity]
arch/arm/include/asm/mach/sharpsl_param.h [moved from include/asm-arm/mach/sharpsl_param.h with 100% similarity]
arch/arm/include/asm/mach/time.h [moved from include/asm-arm/mach/time.h with 97% similarity]
arch/arm/include/asm/mach/udc_pxa2xx.h [moved from include/asm-arm/mach/udc_pxa2xx.h with 95% similarity]
arch/arm/include/asm/mc146818rtc.h [moved from include/asm-arm/mc146818rtc.h with 100% similarity]
arch/arm/include/asm/memory.h [moved from include/asm-arm/memory.h with 99% similarity]
arch/arm/include/asm/mman.h [moved from include/asm-arm/mman.h with 100% similarity]
arch/arm/include/asm/mmu.h [moved from include/asm-arm/mmu.h with 100% similarity]
arch/arm/include/asm/mmu_context.h [moved from include/asm-arm/mmu_context.h with 98% similarity]
arch/arm/include/asm/mmzone.h [moved from include/asm-arm/mmzone.h with 94% similarity]
arch/arm/include/asm/module.h [moved from include/asm-arm/module.h with 100% similarity]
arch/arm/include/asm/msgbuf.h [moved from include/asm-arm/msgbuf.h with 100% similarity]
arch/arm/include/asm/mtd-xip.h [moved from include/asm-arm/mtd-xip.h with 100% similarity]
arch/arm/include/asm/mutex.h [moved from include/asm-arm/mutex.h with 98% similarity]
arch/arm/include/asm/nwflash.h [moved from include/asm-arm/nwflash.h with 100% similarity]
arch/arm/include/asm/page-nommu.h [moved from include/asm-arm/page-nommu.h with 96% similarity]
arch/arm/include/asm/page.h [moved from include/asm-arm/page.h with 99% similarity]
arch/arm/include/asm/param.h [moved from include/asm-arm/param.h with 95% similarity]
arch/arm/include/asm/parport.h [moved from include/asm-arm/parport.h with 86% similarity]
arch/arm/include/asm/pci.h [moved from include/asm-arm/pci.h with 100% similarity]
arch/arm/include/asm/percpu.h [moved from include/asm-arm/percpu.h with 100% similarity]
arch/arm/include/asm/pgalloc.h [moved from include/asm-arm/pgalloc.h with 98% similarity]
arch/arm/include/asm/pgtable-hwdef.h [moved from include/asm-arm/pgtable-hwdef.h with 98% similarity]
arch/arm/include/asm/pgtable-nommu.h [moved from include/asm-arm/pgtable-nommu.h with 98% similarity]
arch/arm/include/asm/pgtable.h [moved from include/asm-arm/pgtable.h with 99% similarity]
arch/arm/include/asm/poll.h [moved from include/asm-arm/poll.h with 100% similarity]
arch/arm/include/asm/posix_types.h [moved from include/asm-arm/posix_types.h with 98% similarity]
arch/arm/include/asm/proc-fns.h [moved from include/asm-arm/proc-fns.h with 99% similarity]
arch/arm/include/asm/processor.h [moved from include/asm-arm/processor.h with 98% similarity]
arch/arm/include/asm/procinfo.h [moved from include/asm-arm/procinfo.h with 97% similarity]
arch/arm/include/asm/ptrace.h [moved from include/asm-arm/ptrace.h with 99% similarity]
arch/arm/include/asm/resource.h [moved from include/asm-arm/resource.h with 100% similarity]
arch/arm/include/asm/scatterlist.h [moved from include/asm-arm/scatterlist.h with 100% similarity]
arch/arm/include/asm/sections.h [moved from include/asm-arm/sections.h with 100% similarity]
arch/arm/include/asm/segment.h [moved from include/asm-arm/segment.h with 100% similarity]
arch/arm/include/asm/sembuf.h [moved from include/asm-arm/sembuf.h with 100% similarity]
arch/arm/include/asm/serial.h [moved from include/asm-arm/serial.h with 91% similarity]
arch/arm/include/asm/setup.h [moved from include/asm-arm/setup.h with 100% similarity]
arch/arm/include/asm/shmbuf.h [moved from include/asm-arm/shmbuf.h with 100% similarity]
arch/arm/include/asm/shmparam.h [moved from include/asm-arm/shmparam.h with 100% similarity]
arch/arm/include/asm/sigcontext.h [moved from include/asm-arm/sigcontext.h with 100% similarity]
arch/arm/include/asm/siginfo.h [moved from include/asm-arm/siginfo.h with 100% similarity]
arch/arm/include/asm/signal.h [moved from include/asm-arm/signal.h with 100% similarity]
arch/arm/include/asm/sizes.h [moved from include/asm-arm/sizes.h with 100% similarity]
arch/arm/include/asm/smp.h [moved from include/asm-arm/smp.h with 97% similarity]
arch/arm/include/asm/socket.h [moved from include/asm-arm/socket.h with 100% similarity]
arch/arm/include/asm/sockios.h [moved from include/asm-arm/sockios.h with 100% similarity]
arch/arm/include/asm/sparsemem.h [moved from include/asm-arm/sparsemem.h with 100% similarity]
arch/arm/include/asm/spinlock.h [moved from include/asm-arm/spinlock.h with 100% similarity]
arch/arm/include/asm/spinlock_types.h [moved from include/asm-arm/spinlock_types.h with 100% similarity]
arch/arm/include/asm/stat.h [moved from include/asm-arm/stat.h with 100% similarity]
arch/arm/include/asm/statfs.h [moved from include/asm-arm/statfs.h with 100% similarity]
arch/arm/include/asm/string.h [moved from include/asm-arm/string.h with 100% similarity]
arch/arm/include/asm/suspend.h [moved from include/asm-arm/suspend.h with 100% similarity]
arch/arm/include/asm/system.h [moved from include/asm-arm/system.h with 100% similarity]
arch/arm/include/asm/termbits.h [moved from include/asm-arm/termbits.h with 100% similarity]
arch/arm/include/asm/termios.h [moved from include/asm-arm/termios.h with 100% similarity]
arch/arm/include/asm/therm.h [moved from include/asm-arm/therm.h with 88% similarity]
arch/arm/include/asm/thread_info.h [moved from include/asm-arm/thread_info.h with 97% similarity]
arch/arm/include/asm/thread_notify.h [moved from include/asm-arm/thread_notify.h with 96% similarity]
arch/arm/include/asm/timex.h [moved from include/asm-arm/timex.h with 93% similarity]
arch/arm/include/asm/tlb.h [moved from include/asm-arm/tlb.h with 98% similarity]
arch/arm/include/asm/tlbflush.h [moved from include/asm-arm/tlbflush.h with 99% similarity]
arch/arm/include/asm/topology.h [moved from include/asm-arm/topology.h with 100% similarity]
arch/arm/include/asm/traps.h [moved from include/asm-arm/traps.h with 100% similarity]
arch/arm/include/asm/types.h [moved from include/asm-arm/types.h with 100% similarity]
arch/arm/include/asm/uaccess.h [moved from include/asm-arm/uaccess.h with 99% similarity]
arch/arm/include/asm/ucontext.h [moved from include/asm-arm/ucontext.h with 100% similarity]
arch/arm/include/asm/unaligned.h [moved from include/asm-arm/unaligned.h with 100% similarity]
arch/arm/include/asm/unistd.h [moved from include/asm-arm/unistd.h with 99% similarity]
arch/arm/include/asm/user.h [moved from include/asm-arm/user.h with 100% similarity]
arch/arm/include/asm/vfp.h [moved from include/asm-arm/vfp.h with 98% similarity]
arch/arm/include/asm/vfpmacros.h [moved from include/asm-arm/vfpmacros.h with 97% similarity]
arch/arm/include/asm/vga.h [moved from include/asm-arm/vga.h with 100% similarity]
arch/arm/include/asm/xor.h [moved from include/asm-arm/xor.h with 99% similarity]
arch/arm/kernel/head-common.S
arch/arm/lib/getuser.S
arch/arm/lib/putuser.S
arch/arm/mm/ioremap.c
arch/arm/mm/proc-arm720.S
arch/arm/nwfpe/fpa11.h

similarity index 98%
rename from include/asm-arm/assembler.h
rename to arch/arm/include/asm/assembler.h
index 911393b..6116e48 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/assembler.h
+ *  arch/arm/include/asm/assembler.h
  *
  *  Copyright (C) 1996-2000 Russell King
  *
similarity index 99%
rename from include/asm-arm/atomic.h
rename to arch/arm/include/asm/atomic.h
index 3b59f94..325f881 100644 (file)
@@ -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.
similarity index 93%
rename from include/asm-arm/bugs.h
rename to arch/arm/include/asm/bugs.h
index ca54eb0..a97f1ea 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/bugs.h
+ *  arch/arm/include/asm/bugs.h
  *
  *  Copyright (C) 1995-2003 Russell King
  *
similarity index 97%
rename from include/asm-arm/byteorder.h
rename to arch/arm/include/asm/byteorder.h
index e6f7fcd..4fbfb22 100644 (file)
@@ -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:
similarity index 80%
rename from include/asm-arm/cache.h
rename to arch/arm/include/asm/cache.h
index 31332c8..cb7a9e9 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/cache.h
+ *  arch/arm/include/asm/cache.h
  */
 #ifndef __ASMARM_CACHE_H
 #define __ASMARM_CACHE_H
similarity index 99%
rename from include/asm-arm/cacheflush.h
rename to arch/arm/include/asm/cacheflush.h
index e68a1cb..9073d9c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/cacheflush.h
+ *  arch/arm/include/asm/cacheflush.h
  *
  *  Copyright (C) 1999-2002 Russell King
  *
similarity index 98%
rename from include/asm-arm/checksum.h
rename to arch/arm/include/asm/checksum.h
index eaa0efd..6dcc164 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/checksum.h
+ *  arch/arm/include/asm/checksum.h
  *
  * IP checksum routines
  *
similarity index 97%
rename from include/asm-arm/cpu-multi32.h
rename to arch/arm/include/asm/cpu-multi32.h
index 3479de9..e2b5b0b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/cpu-multi32.h
+ *  arch/arm/include/asm/cpu-multi32.h
  *
  *  Copyright (C) 2000 Russell King
  *
similarity index 97%
rename from include/asm-arm/cpu-single.h
rename to arch/arm/include/asm/cpu-single.h
index 0b120ee..f073a6d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/cpu-single.h
+ *  arch/arm/include/asm/cpu-single.h
  *
  *  Copyright (C) 2000 Russell King
  *
similarity index 93%
rename from include/asm-arm/cpu.h
rename to arch/arm/include/asm/cpu.h
index 715426b..634b2d7 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/cpu.h
+ *  arch/arm/include/asm/cpu.h
  *
  *  Copyright (C) 2004-2005 ARM Ltd.
  *
similarity index 98%
rename from include/asm-arm/domain.h
rename to arch/arm/include/asm/domain.h
index 3c12a76..cc7ef40 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/domain.h
+ *  arch/arm/include/asm/domain.h
  *
  *  Copyright (C) 1999 Russell King.
  *
similarity index 99%
rename from include/asm-arm/ecard.h
rename to arch/arm/include/asm/ecard.h
index 5e22881..29f2610 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/ecard.h
+ * arch/arm/include/asm/ecard.h
  *
  * definitions for expansion cards
  *
similarity index 96%
rename from include/asm-arm/fiq.h
rename to arch/arm/include/asm/fiq.h
index a3bad09..2242ce2 100644 (file)
@@ -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
similarity index 90%
rename from include/asm-arm/flat.h
rename to arch/arm/include/asm/flat.h
index 9918aa4..1d77e51 100644 (file)
@@ -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__
similarity index 99%
rename from include/asm-arm/floppy.h
rename to arch/arm/include/asm/floppy.h
index 41a5e9d..dce20c2 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/floppy.h
+ *  arch/arm/include/asm/floppy.h
  *
  *  Copyright (C) 1996-2000 Russell King
  *
similarity index 97%
rename from include/asm-arm/fpstate.h
rename to arch/arm/include/asm/fpstate.h
index 392eb53..ee5e03e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/fpstate.h
+ *  arch/arm/include/asm/fpstate.h
  *
  *  Copyright (C) 1995 Russell King
  *
similarity index 99%
rename from include/asm-arm/glue.h
rename to arch/arm/include/asm/glue.h
index a97a182..a0e39d5 100644 (file)
@@ -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.
similarity index 90%
rename from include/asm-arm/hardware.h
rename to arch/arm/include/asm/hardware.h
index 1fd1a5b..eb3b3ab 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware.h
+ *  arch/arm/include/asm/hardware.h
  *
  *  Copyright (C) 1996 Russell King
  *
similarity index 97%
rename from include/asm-arm/hardware/cache-l2x0.h
rename to arch/arm/include/asm/hardware/cache-l2x0.h
index 54029a7..64f2252 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/hardware/cache-l2x0.h
+ * arch/arm/include/asm/hardware/cache-l2x0.h
  *
  * Copyright (C) 2007 ARM Limited
  *
similarity index 99%
rename from include/asm-arm/hardware/clps7111.h
rename to arch/arm/include/asm/hardware/clps7111.h
index 8d3228d..4447722 100644 (file)
@@ -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.
similarity index 97%
rename from include/asm-arm/hardware/cs89712.h
rename to arch/arm/include/asm/hardware/cs89712.h
index ad99a3e..f756269 100644 (file)
@@ -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.
similarity index 93%
rename from include/asm-arm/hardware/debug-8250.S
rename to arch/arm/include/asm/hardware/debug-8250.S
index 07c97fb..22c6892 100644 (file)
@@ -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
  *
similarity index 93%
rename from include/asm-arm/hardware/debug-pl01x.S
rename to arch/arm/include/asm/hardware/debug-pl01x.S
index 23c541a..f9fd083 100644 (file)
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/hardware/debug-pl01x.S
+/* arch/arm/include/asm/hardware/debug-pl01x.S
  *
  * Debugging macro include header
  *
similarity index 99%
rename from include/asm-arm/hardware/dec21285.h
rename to arch/arm/include/asm/hardware/dec21285.h
index 546f707..7068a1c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/dec21285.h
+ *  arch/arm/include/asm/hardware/dec21285.h
  *
  *  Copyright (C) 1998 Russell King
  *
@@ -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
  *
similarity index 96%
rename from include/asm-arm/hardware/ep7211.h
rename to arch/arm/include/asm/hardware/ep7211.h
index 017aa68..654d5f6 100644 (file)
@@ -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.
similarity index 98%
rename from include/asm-arm/hardware/ep7212.h
rename to arch/arm/include/asm/hardware/ep7212.h
index 0e952e7..3b43bbe 100644 (file)
@@ -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.
similarity index 96%
rename from include/asm-arm/hardware/gic.h
rename to arch/arm/include/asm/hardware/gic.h
index 966e428..4924914 100644 (file)
@@ -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.
  *
similarity index 96%
rename from include/asm-arm/hardware/icst307.h
rename to arch/arm/include/asm/hardware/icst307.h
index ff8618a..554f128 100644 (file)
@@ -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.
  *
similarity index 96%
rename from include/asm-arm/hardware/icst525.h
rename to arch/arm/include/asm/hardware/icst525.h
index edd5a57..58f0dc4 100644 (file)
@@ -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.
  *
similarity index 97%
rename from include/asm-arm/hardware/ioc.h
rename to arch/arm/include/asm/hardware/ioc.h
index b3b46ef..1f6b801 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/ioc.h
+ *  arch/arm/include/asm/hardware/ioc.h
  *
  *  Copyright (C) Russell King
  *
similarity index 99%
rename from include/asm-arm/hardware/iomd.h
rename to arch/arm/include/asm/hardware/iomd.h
index 396e55a..9c5afbd 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/iomd.h
+ *  arch/arm/include/asm/hardware/iomd.h
  *
  *  Copyright (C) 1999 Russell King
  *
similarity index 97%
rename from include/asm-arm/hardware/iop3xx-gpio.h
rename to arch/arm/include/asm/hardware/iop3xx-gpio.h
index 0c9331f..222e74b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/hardware/iop3xx-gpio.h
+ * arch/arm/include/asm/hardware/iop3xx-gpio.h
  *
  * IOP3xx GPIO wrappers
  *
similarity index 99%
rename from include/asm-arm/hardware/iop3xx.h
rename to arch/arm/include/asm/hardware/iop3xx.h
index 18f6937..4b8e7f5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/hardware/iop3xx.h
+ * arch/arm/include/asm/hardware/iop3xx.h
  *
  * Intel IOP32X and IOP33X register definitions
  *
similarity index 99%
rename from include/asm-arm/hardware/locomo.h
rename to arch/arm/include/asm/hardware/locomo.h
index fb0645d..954b1be 100644 (file)
@@ -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
  *
similarity index 93%
rename from include/asm-arm/hardware/memc.h
rename to arch/arm/include/asm/hardware/memc.h
index 8aef5aa..42ba7c1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/hardware/memc.h
+ *  arch/arm/include/asm/hardware/memc.h
  *
  *  Copyright (C) Russell King.
  *
similarity index 99%
rename from include/asm-arm/hardware/pci_v3.h
rename to arch/arm/include/asm/hardware/pci_v3.h
index 4d497bd..2811c7e 100644 (file)
@@ -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
  *
similarity index 99%
rename from include/asm-arm/hardware/sa1111.h
rename to arch/arm/include/asm/hardware/sa1111.h
index 61b1d05..6cf98d4 100644 (file)
@@ -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>
  *
similarity index 97%
rename from include/asm-arm/hardware/vic.h
rename to arch/arm/include/asm/hardware/vic.h
index ed9ca37..263f2c3 100644 (file)
@@ -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.
  *
similarity index 93%
rename from include/asm-arm/ide.h
rename to arch/arm/include/asm/ide.h
index a48019f..b507ce8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/ide.h
+ *  arch/arm/include/asm/ide.h
  *
  *  Copyright (C) 1994-1996  Linus Torvalds & authors
  */
similarity index 99%
rename from include/asm-arm/io.h
rename to arch/arm/include/asm/io.h
index eebe56e..ffe07c0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/io.h
+ *  arch/arm/include/asm/io.h
  *
  *  Copyright (C) 1996-2000 Russell King
  *
similarity index 98%
rename from include/asm-arm/kprobes.h
rename to arch/arm/include/asm/kprobes.h
index b1a3787..a5d0d99 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/kprobes.h
+ * arch/arm/include/asm/kprobes.h
  *
  * Copyright (C) 2006, 2007 Motorola Inc.
  *
similarity index 96%
rename from include/asm-arm/leds.h
rename to arch/arm/include/asm/leds.h
index 12290ea..c545739 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/leds.h
+ *  arch/arm/include/asm/leds.h
  *
  *  Copyright (C) 1998 Russell King
  *
similarity index 99%
rename from include/asm-arm/locks.h
rename to arch/arm/include/asm/locks.h
index 852220e..ef4c897 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/locks.h
+ *  arch/arm/include/asm/locks.h
  *
  *  Copyright (C) 2000 Russell King
  *
similarity index 97%
rename from include/asm-arm/mach/arch.h
rename to arch/arm/include/asm/mach/arch.h
index bcc8aed..c59842d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mach/arch.h
+ *  arch/arm/include/asm/mach/arch.h
  *
  *  Copyright (C) 2000 Russell King
  *
similarity index 97%
rename from include/asm-arm/mach/dma.h
rename to arch/arm/include/asm/mach/dma.h
index e7c4a20..fc7278e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mach/dma.h
+ *  arch/arm/include/asm/mach/dma.h
  *
  *  Copyright (C) 1998-2000 Russell King
  *
similarity index 96%
rename from include/asm-arm/mach/flash.h
rename to arch/arm/include/asm/mach/flash.h
index 05b029e..4ca69fe 100644 (file)
@@ -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.
  *
similarity index 93%
rename from include/asm-arm/mach/irda.h
rename to arch/arm/include/asm/mach/irda.h
index 58984d9..38f77b5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mach/irda.h
+ *  arch/arm/include/asm/mach/irda.h
  *
  *  Copyright (C) 2004 Russell King.
  *
similarity index 96%
rename from include/asm-arm/mach/irq.h
rename to arch/arm/include/asm/mach/irq.h
index eb0bfba..c57b52c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mach/irq.h
+ *  arch/arm/include/asm/mach/irq.h
  *
  *  Copyright (C) 1995-2000 Russell King.
  *
similarity index 96%
rename from include/asm-arm/mach/map.h
rename to arch/arm/include/asm/mach/map.h
index 7ef3c83..06f583b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/map.h
+ *  arch/arm/include/asm/map.h
  *
  *  Copyright (C) 1999-2000 Russell King
  *
similarity index 88%
rename from include/asm-arm/mach/mmc.h
rename to arch/arm/include/asm/mach/mmc.h
index eb91145..4da332b 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/mach/pci.h
rename to arch/arm/include/asm/mach/pci.h
index 9d4f6b5..32da1ae 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mach/pci.h
+ *  arch/arm/include/asm/mach/pci.h
  *
  *  Copyright (C) 2000 Russell King
  *
similarity index 94%
rename from include/asm-arm/mach/serial_at91.h
rename to arch/arm/include/asm/mach/serial_at91.h
index 55b317a..ea6d063 100644 (file)
@@ -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
  *
similarity index 86%
rename from include/asm-arm/mach/serial_sa1100.h
rename to arch/arm/include/asm/mach/serial_sa1100.h
index 20c22bb..d09064b 100644 (file)
@@ -1,9 +1,9 @@
 /*
- *  linux/include/asm-arm/mach/serial_sa1100.h
+ *  arch/arm/include/asm/mach/serial_sa1100.h
  *
  *  Author: Nicolas Pitre
  *
- * Moved to include/asm-arm/mach and changed lots, Russell King
+ * Moved and changed lots, Russell King
  *
  * Low level machine dependent UART functions.
  */
similarity index 97%
rename from include/asm-arm/mach/time.h
rename to arch/arm/include/asm/mach/time.h
index 2fd36ea..b2cc1fc 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/mach/time.h
+ * arch/arm/include/asm/mach/time.h
  *
  * Copyright (C) 2004 MontaVista Software, Inc.
  *
similarity index 95%
rename from include/asm-arm/mach/udc_pxa2xx.h
rename to arch/arm/include/asm/mach/udc_pxa2xx.h
index 9e5ed7c..270902c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/mach/udc_pxa2xx.h
+ * arch/arm/include/asm/mach/udc_pxa2xx.h
  *
  * This supports machine-specific differences in how the PXA2xx
  * USB Device Controller (UDC) is wired.
similarity index 99%
rename from include/asm-arm/memory.h
rename to arch/arm/include/asm/memory.h
index 9ba4d71..9206922 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/memory.h
+ *  arch/arm/include/asm/memory.h
  *
  *  Copyright (C) 2000-2002 Russell King
  *  modification for nommu, Hyok S. Choi, 2004
similarity index 98%
rename from include/asm-arm/mmu_context.h
rename to arch/arm/include/asm/mmu_context.h
index 91b9dfd..a301e44 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mmu_context.h
+ *  arch/arm/include/asm/mmu_context.h
  *
  *  Copyright (C) 1996 Russell King.
  *
similarity index 94%
rename from include/asm-arm/mmzone.h
rename to arch/arm/include/asm/mmzone.h
index b87de15..f2fbb50 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/mmzone.h
+ *  arch/arm/include/asm/mmzone.h
  *
  *  1999-12-29 Nicolas Pitre           Created
  *
similarity index 98%
rename from include/asm-arm/mutex.h
rename to arch/arm/include/asm/mutex.h
index 020bd98..93226cf 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/mutex.h
+ * arch/arm/include/asm/mutex.h
  *
  * ARM optimized mutex locking primitives
  *
similarity index 96%
rename from include/asm-arm/page-nommu.h
rename to arch/arm/include/asm/page-nommu.h
index ea1cde8..3574c0d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/page-nommu.h
+ *  arch/arm/include/asm/page-nommu.h
  *
  *  Copyright (C) 2004 Hyok S. Choi
  *
similarity index 99%
rename from include/asm-arm/page.h
rename to arch/arm/include/asm/page.h
index 7c5fc55..cf2e268 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/page.h
+ *  arch/arm/include/asm/page.h
  *
  *  Copyright (C) 1995-2003 Russell King
  *
similarity index 95%
rename from include/asm-arm/param.h
rename to arch/arm/include/asm/param.h
index 1580646..8b24bf9 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/param.h
+ *  arch/arm/include/asm/param.h
  *
  *  Copyright (C) 1995-1999 Russell King
  *
similarity index 86%
rename from include/asm-arm/parport.h
rename to arch/arm/include/asm/parport.h
index f2f90c7..26e94b0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/parport.h: ARM-specific parport initialisation
+ *  arch/arm/include/asm/parport.h: ARM-specific parport initialisation
  *
  *  Copyright (C) 1999, 2000  Tim Waugh <tim@cyberelk.demon.co.uk>
  *
similarity index 98%
rename from include/asm-arm/pgalloc.h
rename to arch/arm/include/asm/pgalloc.h
index 163b030..3dcd64b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/pgalloc.h
+ *  arch/arm/include/asm/pgalloc.h
  *
  *  Copyright (C) 2000-2001 Russell King
  *
similarity index 98%
rename from include/asm-arm/pgtable-hwdef.h
rename to arch/arm/include/asm/pgtable-hwdef.h
index f3b5120..fd1521d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/pgtable-hwdef.h
+ *  arch/arm/include/asm/pgtable-hwdef.h
  *
  *  Copyright (C) 1995-2002 Russell King
  *
similarity index 98%
rename from include/asm-arm/pgtable-nommu.h
rename to arch/arm/include/asm/pgtable-nommu.h
index 386fcc1..b011f2e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/pgtable-nommu.h
+ *  arch/arm/include/asm/pgtable-nommu.h
  *
  *  Copyright (C) 1995-2002 Russell King
  *  Copyright (C) 2004  Hyok S. Choi
similarity index 99%
rename from include/asm-arm/pgtable.h
rename to arch/arm/include/asm/pgtable.h
index 5571c13..8ab060a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/pgtable.h
+ *  arch/arm/include/asm/pgtable.h
  *
  *  Copyright (C) 1995-2002 Russell King
  *
similarity index 98%
rename from include/asm-arm/posix_types.h
rename to arch/arm/include/asm/posix_types.h
index c37379d..2446d23 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/posix_types.h
+ *  arch/arm/include/asm/posix_types.h
  *
  *  Copyright (C) 1996-1998 Russell King.
  *
similarity index 99%
rename from include/asm-arm/proc-fns.h
rename to arch/arm/include/asm/proc-fns.h
index 75ec760..db80203 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/proc-fns.h
+ *  arch/arm/include/asm/proc-fns.h
  *
  *  Copyright (C) 1997-1999 Russell King
  *  Copyright (C) 2000 Deep Blue Solutions Ltd
similarity index 98%
rename from include/asm-arm/processor.h
rename to arch/arm/include/asm/processor.h
index bd8029e..b01d5e7 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/processor.h
+ *  arch/arm/include/asm/processor.h
  *
  *  Copyright (C) 1995-1999 Russell King
  *
similarity index 97%
rename from include/asm-arm/procinfo.h
rename to arch/arm/include/asm/procinfo.h
index 4d3c685..ca52e58 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/procinfo.h
+ *  arch/arm/include/asm/procinfo.h
  *
  *  Copyright (C) 1996-1999 Russell King
  *
similarity index 99%
rename from include/asm-arm/ptrace.h
rename to arch/arm/include/asm/ptrace.h
index 8382b75..b415c0e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/ptrace.h
+ *  arch/arm/include/asm/ptrace.h
  *
  *  Copyright (C) 1996-2003 Russell King
  *
similarity index 91%
rename from include/asm-arm/serial.h
rename to arch/arm/include/asm/serial.h
index 015b262..ebb0490 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/serial.h
+ *  arch/arm/include/asm/serial.h
  *
  *  Copyright (C) 1996 Russell King.
  *
similarity index 97%
rename from include/asm-arm/smp.h
rename to arch/arm/include/asm/smp.h
index 7fffa24..cc12a52 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/smp.h
+ *  arch/arm/include/asm/smp.h
  *
  *  Copyright (C) 2004-2005 ARM Ltd.
  *
@@ -17,7 +17,7 @@
 #include <asm/arch/smp.h>
 
 #ifndef CONFIG_SMP
-# error "<asm-arm/smp.h> included in non-SMP build"
+# error "<asm/smp.h> included in non-SMP build"
 #endif
 
 #define raw_smp_processor_id() (current_thread_info()->cpu)
similarity index 88%
rename from include/asm-arm/therm.h
rename to arch/arm/include/asm/therm.h
index e51c923..f002f01 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/therm.h: Definitions for Dallas Semiconductor
+ * arch/arm/include/asm/therm.h: Definitions for Dallas Semiconductor
  *  DS1620 thermometer driver (as used in the Rebel.com NetWinder)
  */
 #ifndef __ASM_THERM_H
similarity index 97%
rename from include/asm-arm/thread_info.h
rename to arch/arm/include/asm/thread_info.h
index d4be2d6..e56fa48 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/thread_info.h
+ *  arch/arm/include/asm/thread_info.h
  *
  *  Copyright (C) 2002 Russell King.
  *
@@ -117,7 +117,7 @@ extern void iwmmxt_task_switch(struct thread_info *);
 
 /*
  * We use bit 30 of the preempt_count to indicate that kernel
- * preemption is occurring.  See include/asm-arm/hardirq.h.
+ * preemption is occurring.  See <asm/hardirq.h>.
  */
 #define PREEMPT_ACTIVE 0x40000000
 
similarity index 96%
rename from include/asm-arm/thread_notify.h
rename to arch/arm/include/asm/thread_notify.h
index 8866e52..f27379d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/thread_notify.h
+ *  arch/arm/include/asm/thread_notify.h
  *
  *  Copyright (C) 2006 Russell King.
  *
similarity index 93%
rename from include/asm-arm/timex.h
rename to arch/arm/include/asm/timex.h
index 7b8d4cb..e50e292 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/timex.h
+ *  arch/arm/include/asm/timex.h
  *
  *  Copyright (C) 1997,1998 Russell King
  *
similarity index 98%
rename from include/asm-arm/tlb.h
rename to arch/arm/include/asm/tlb.h
index 36bd402..857f1df 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/tlb.h
+ *  arch/arm/include/asm/tlb.h
  *
  *  Copyright (C) 2002 Russell King
  *
similarity index 99%
rename from include/asm-arm/tlbflush.h
rename to arch/arm/include/asm/tlbflush.h
index 909656c..0d0d40f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/tlbflush.h
+ *  arch/arm/include/asm/tlbflush.h
  *
  *  Copyright (C) 1999-2003 Russell King
  *
similarity index 99%
rename from include/asm-arm/uaccess.h
rename to arch/arm/include/asm/uaccess.h
index 4c1a3fa..d0f51ff 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/uaccess.h
+ *  arch/arm/include/asm/uaccess.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
similarity index 99%
rename from include/asm-arm/unistd.h
rename to arch/arm/include/asm/unistd.h
index 7c57008..f95fbb2 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/unistd.h
+ *  arch/arm/include/asm/unistd.h
  *
  *  Copyright (C) 2001-2005 Russell King
  *
similarity index 98%
rename from include/asm-arm/vfp.h
rename to arch/arm/include/asm/vfp.h
index 5f9a2cb..f4ab34f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/vfp.h
+ * arch/arm/include/asm/vfp.h
  *
  * VFP register definitions.
  * First, the standard VFP set.
similarity index 97%
rename from include/asm-arm/vfpmacros.h
rename to arch/arm/include/asm/vfpmacros.h
index cccb389..422f3cc 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/vfpmacros.h
+ * arch/arm/include/asm/vfpmacros.h
  *
  * Assembler-only file containing VFP macros and register definitions.
  */
similarity index 99%
rename from include/asm-arm/xor.h
rename to arch/arm/include/asm/xor.h
index e7c4cf5..7604673 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/xor.h
+ *  arch/arm/include/asm/xor.h
  *
  *  Copyright (C) 2001 Russell King
  *
index 7e9c00a..1c3c6ea 100644 (file)
@@ -181,7 +181,7 @@ ENTRY(lookup_processor_type)
        ldmfd   sp!, {r4 - r7, r9, pc}
 
 /*
- * Look in include/asm-arm/procinfo.h and arch/arm/kernel/arch.[ch] for
+ * Look in <asm/procinfo.h> and arch/arm/kernel/arch.[ch] for
  * more information about the __proc_info and __arch_info structures.
  */
        .long   __proc_info_begin
index 1dd8ea4..2034d4d 100644 (file)
@@ -20,7 +20,7 @@
  *             r2, r3 contains the zero-extended value
  *             lr corrupted
  *
- * No other registers must be altered.  (see include/asm-arm/uaccess.h
+ * No other registers must be altered.  (see <asm/uaccess.h>
  * for specific ASM register usage).
  *
  * Note that ADDR_LIMIT is either 0 or 0xc0000000.
index 8620afe..08ec7df 100644 (file)
@@ -20,7 +20,7 @@
  * Outputs:    r0 is the error code
  *             lr corrupted
  *
- * No other registers must be altered.  (see include/asm-arm/uaccess.h
+ * No other registers must be altered.  (see <asm/uaccess.h>
  * for specific ASM register usage).
  *
  * Note that ADDR_LIMIT is either 0 or 0xc0000000
index 303a7ff..b81dbf9 100644 (file)
@@ -259,7 +259,7 @@ remap_area_supersections(unsigned long virt, unsigned long pfn,
  * caller shouldn't need to know that small detail.
  *
  * 'flags' are the extra L_PTE_ flags that you want to specify for this
- * mapping.  See include/asm-arm/proc-armv/pgtable.h for more information.
+ * mapping.  See <asm/pgtable.h> for more information.
  */
 void __iomem *
 __arm_ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
index d64f8e6..eda733d 100644 (file)
@@ -231,7 +231,7 @@ cpu_arm720_name:
                .align
 
 /*
- * See linux/include/asm-arm/procinfo.h for a definition of this structure.
+ * See <asm/procinfo.h> for a definition of this structure.
  */
        
                .section ".proc.info.init", #alloc, #execinstr
index 4a4d02c..386cbd1 100644 (file)
@@ -69,7 +69,7 @@ typedef union tagFPREG {
  * This structure is exported to user space.  Do not re-order.
  * Only add new stuff to the end, and do not change the size of
  * any element.  Elements of this structure are used by user
- * space, and must match struct user_fp in include/asm-arm/user.h.
+ * space, and must match struct user_fp in <asm/user.h>.
  * We include the byte offsets below for documentation purposes.
  *
  * The size of this structure and FPREG are checked by fpmodule.c