]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] move include/asm-arm to arch/arm/include/asm
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 2 Aug 2008 09:55:55 +0000 (10:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 2 Aug 2008 20:32:35 +0000 (21:32 +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 911393b2c6f000cc39bf84d73a7385883c105e5f..6116e4893c0ade4bc478996a82c316ce5c99a64e 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 3b59f94b5a3d3f345bf5bfeff53440063ae3f426..325f881ccb50204041ed15b824ae0b73e2dcae3f 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 ca54eb0f12d75cc15ea35281d5cb72f3050171cb..a97f1ea708d19f339649a2ece287a69a5fe32a40 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 e6f7fcdc73b0299524b1e3b6a6b83eb9f360424f..4fbfb22f65a0f4444818e455422b60d3e61545d0 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 31332c8ac04ea0a21d184ff61db9044a094506a7..cb7a9e97fd7ef7807161f509e0260a6fa94233cc 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 e68a1cbcc85209d99fa3a927bb40cb6727690e02..9073d9c6567e7c8b8065534563bee01ce83c9e37 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 eaa0efd8d0d47e39ce6b5087a9eb60d1bc61811b..6dcc164308688c8efdf7f688f239169537470da4 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 3479de9266e5584ec6c404ea08786347d121e03c..e2b5b0b2116a705819995256e51b70bc27abb764 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 0b120ee36091c962c9ce5b52da1efe58cdda4cbb..f073a6d2a406bc5125c80b6e74fd8f042826daad 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 715426b9b08ef355728a7ce9ebde64b5d522ce14..634b2d7c612a706d8f9b5662e50d5848864cac5d 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 3c12a7625304d24d19bcb9e469c5b5bbcca8faef..cc7ef4080711ff5b2b506449dc54602d8fe65b8d 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 5e22881a630da8a12a9a737cc86696cc204383fd..29f2610efc70775a7059f4b5f63e1cc175c78749 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 a3bad09e825caff503c8be058c76d878299bfe8f..2242ce22ec6c866285391f94696149e3977dece3 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 9918aa46d9e53c03983604b6b70237516d11d183..1d77e51907f6ddb70f5aa8123583827bffaa676c 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 41a5e9d6bb694999ad426a2a6526a0556e00f1d7..dce20c25ab10f87eb1c01426a79e4d08d078acb9 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 392eb53323238d16a6b9e80a8363960b06c1103e..ee5e03efc1bbe3dff88c2acc8313ab08136cd98b 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 a97a182ba28732a4d9d22ae353efcf695696bd46..a0e39d5d00c936a68ac4f99ca9a9b6559b61854f 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 1fd1a5b6504ba961468825435fb64a129b84c1d8..eb3b3abb7db7a0b649a915f049e753aca6f15ee0 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 54029a740396de55f36cae0f826401bf6513e06d..64f2252a25cdc4fd5048ba28f9b9872267aebcdd 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 8d3228dc17784b7cd2c44a2158616c5b80c8e511..44477225aed60fdbc9f1ac56eba5853a3663ba7e 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 ad99a3e1b80296a2c85a904ed082b26a7f0eb58b..f75626933e94d5801eaf8f2407ec6d8a17224158 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 07c97fb233fcd50d4963fe9e3b4f8201251dde16..22c689255e6e8767499c90b03732ce94d16efcbc 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 23c541a9e89abc896098de362fee893d0eeb4297..f9fd083eff630dd29b0710d603c11447919b9d54 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 546f7077be9c42313dbae0798c59a8c8f50933a1..7068a1c1e4e4d3a6d8dd776ecc12cdc301617332 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
  *
similarity index 99%
rename from include/asm-arm/hardware/entry-macro-iomd.S
rename to arch/arm/include/asm/hardware/entry-macro-iomd.S
index 9bb580a5b15edddb745a69192e1be76c17c431a6..e0af4983723fbf99b2a4d8e93abe985c46b83b21 100644 (file)
@@ -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 017aa68f612db33f5b4b18a126455560473739ff..654d5f625c49c4b938a6eede027869836c3e73ea 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 0e952e7470730eecf3370893b33182d751081aee..3b43bbeaf1db453523254aaa241c3250c5ad1dbe 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 966e428ad32c858aec9870a9cb72491effa7b3f3..4924914af1882afd80a31222cf858c1812d050fc 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 ff8618a441c0c717f2467118fc05a2dd8246f586..554f128a104641aed7b4c2b747276c0f339173bf 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 edd5a5704406cc16bd11c8c0087d9dc8a04a6951..58f0dc43e2edb82bbed9a193bfe370db8f2a544a 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 b3b46ef659432e3b11e46c567398146ed5bf9bc6..1f6b8013becb4c58618790983d9a93f721112c9c 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 396e55ad06c6afe41fb754b548d257ca04c0c1a7..9c5afbd71a69a4bbdaf6e8d8c806e07f3f199db1 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 0c9331f9ac2464b5560cb024efa3e09a8198b0c8..222e74b7c4639f10a0dfaefe9be199e7b02ab0f3 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 18f6937f50103d1ec60d04412c67613b2b739eae..4b8e7f559929970b739af0f080b67a6c16247602 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 fb0645de6f3158b72c6685514ac181240de8230e..954b1be991b4a19a9e7001c2996b4821cf50752b 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 8aef5aa0e01bddb81f715ab92d584d9494f92b28..42ba7c167d1fb62bfcb7f778e406d97f12b536cc 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 4d497bdb9a9796b6efb6a7fa50bca889374fcff0..2811c7e2cfdf1c67ea172031ecb8b21d148203ad 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 61b1d05c7df74772f95cd581cd06c05ee81cbdf8..6cf98d4f7dc3ee6bd913419c8f06f083891191b0 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 ed9ca3736a0be3c02630a29f5f00490731402907..263f2c362a306166e92812963b42c10992d79fb1 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 a48019f99d08acd160a2dd098c960dc4c5cdac2a..b507ce8e5019af2b879f0a38005d71f235898b9f 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 eebe56e74d6d9f4ca922ebf7c1ad667a2c66d879..ffe07c0f46d8d4019d5f48054d99e94827a7fdee 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 b1a37876942deb793252e35f7b826f77fec0d9a1..a5d0d99ad38705b42e24735e5835de9c33663746 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 12290ea55801c101341e0707c233bf9fb4e082ab..c545739f39b7e5761b7611431fd9db55183a5841 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 852220eecdbc5d3147528bd6853f2a039ae91543..ef4c897772d1459f589ac2a1967a742e822cad2a 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 bcc8aed7c9a9a994baff55d06d3c639105b31978..c59842dc7cb8d8f2b3a3e140d3a17d8da575efe0 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 e7c4a20aad531c72de46e36c296aa9fd24d8edb9..fc7278ea7146798d50c0dfb219bae5db025fefab 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 05b029ef6371c6203b1471897490bebce8920815..4ca69fe2c850c0a995574ffe250444d8062d8d95 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 58984d9c0b0b34a121246ae22793186696078cbe..38f77b5e56cfc6dae2d4dbb92f87f66805cfb0c2 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 eb0bfba6570d6ae294fa50adf0a349527ba2ad86..c57b52ce574aadff6728eefebfcb5d2499dba3cc 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 7ef3c83901806b4abadd0b748568028fcf1470a5..06f583b13999c220ba835658c657460ccb1a5783 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 eb91145c00c4c7d5d0b2c99aab10640a8080e89d..4da332b03144c4d27bf07876506f2c94f72adb0b 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 9d4f6b5ea4190645129497cdc0af908917fafbe0..32da1ae17e066f94bc65c6368ddcdb9dc83b6ef7 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 55b317a89061b58ca673b0fe080ed3a361aecf69..ea6d063923b8f0b3d1b16a8c79b5aeb094d92cc7 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 20c22bb218d92493240fae963cd0816d67d514a4..d09064bf95a0d465a578c821c55fb9a57f24e01b 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 2fd36ea0130df8f687f4437c25086cb6f1b15209..b2cc1fcd040059f2381c8491dfe0d94568615372 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 9e5ed7c0f27fb50150f84a303b61a205eb881bc2..270902c353fde579c62f9fd53e83d8cc28ddbefa 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 9ba4d7136e6b2dfeaf714df43f35be6c616da9ba..92069221dca9ba5f59b34b1ad2c06a72c77e6286 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 91b9dfdfed526235131bc4b026039064be28f9d7..a301e446007f541826a33d6f45d330f365222bec 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 b87de151f0a480ab81189b3ff470eaf19a263219..f2fbb508490160a212be0a1252e5deffeb64aceb 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 020bd98710a13ce2e82ff5e0741fa89308172985..93226cf23ae0a838e192be1d675ee886be9dd52e 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 ea1cde84f500d96e5dd552b63fc8e0736f593ef2..3574c0deb37fc34de5d4dd752e9cf30b2ef6305e 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 7c5fc5582e5dde1cdadbc9d3758a205f7aa5cd61..cf2e2680daaa1c03ede70035d4497414f917d88a 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 15806468ba72801a38320c3a131f7842b10045fa..8b24bf94c06baac0e054c88c402e1ac01eed4bb1 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 f2f90c76ddd1e63aac096f76b4c7cd2be2baace7..26e94b09035a77bcdaf49405b9e83607b7af8704 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 163b0305dd76b3e83176f294eb204d3a389bd3ad..3dcd64bf18241498e91951b82d56c3c6445b76c8 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 f3b5120c99fef34b598dd110790cc008eb815f7e..fd1521d5cb9dd97e07e8f5a54b7994295294a7d3 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 386fcc10a9730da5fbd2372322a27b040625705e..b011f2e939aa703da1366306bfa75a980d217c37 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 5571c13c3f3bb0af57ba3ea85d7f22bf78fa68d6..8ab060a53ab0a9cb4913de95048e4a1b6fd79028 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 c37379dadcb294f92a88d1c145029f935eed7c78..2446d23bfdbffcfea8dd7e3374ab6a2955ff9ce6 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 75ec760f4c748a0bb9ab5722e552c45b866599b8..db80203b68e0a380ee84dfbab9cc60c279adbfad 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 bd8029e8dc67fd19cc6ed02f5f62f0debb074dd1..b01d5e7e3d5abb4a5632c1b677764310c81db243 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 4d3c685075e08d9c1db94897cf4ab9ba1933681f..ca52e584ef74fd432614a5d9a2e9dc6188caa9f2 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 8382b7510f942de6b7d4db7a6e459e9576d64b36..b415c0e85458952899b2ba910aeccfd053952584 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 015b262dc14572cfd743d37a514a45e2152de5d0..ebb049091e26033502dec932ab9015486c713894 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 7fffa2404b8e8c8b24d360148d3c164af7169111..cc12a525a06a337e61d1448d23968111230e11d5 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 e51c923ecdf3119d5a4677fa13570f744b77be0a..f002f0197d78a7d6eecf2a9272c743334aefd3bd 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 d4be2d64616087a4ebf3bf2427d399314c6584b3..e56fa48e4ae7843436021e19fb067233c67e6a02 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 8866e52168400847d669cea1529d4a174e1e7959..f27379d7f72a670b01e2e70b2b09b97cc9c98862 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 7b8d4cb24be0bc6353615b6d407d7a242b3da860..e50e2926cd6ecce6ad0b038aa8ff2f56d25f937f 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 36bd402a21cb12ad52ffd610e740fc83b265efde..857f1dfac794c5bc5ef63a01b840f3444d0c2888 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 909656c747ef380beddbaeba34724a862cd7f97b..0d0d40f1b599eccff4c709f1bbd2a412f08812bc 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 4c1a3fa9f2596cac7243e7d932252deb56817c0f..d0f51ff900b5d029e278b9b9480c6b90cd6226b7 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 7c570082b1e0c6850471a3cfaf182f1dad28f88b..f95fbb2fcb5ffc2a59e1b032b89f50534be8971a 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 5f9a2cb3d452fb4d1e42a1d43dc95439286f5e8c..f4ab34fd4f72cc70ce0ece49eef7187f97e33763 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 cccb3892e73c0c24a097f264f0dfd24dc7186771..422f3cc204a27310f99d9b25adebb9f49d16e3d0 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 e7c4cf58bed1a88b55541b3e266c70f5c236fff0..7604673dc4278609b4f7ba68985d8b996b49ec47 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/xor.h
+ *  arch/arm/include/asm/xor.h
  *
  *  Copyright (C) 2001 Russell King
  *
index 7e9c00a8a4127ee35dad9507b109f13f319f23a3..1c3c6ea5f9e7e3bb7b7ce5a880a039489200d200 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 1dd8ea4f9a9c5f7b13e91e2a4c87948803d539f1..2034d4dbe6ad3a3cddf20c8e9f75516021e93c92 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 8620afe54f720da93ad062ff02df7a9e96743068..08ec7dffa52e44cf5d15b720891b0717547ad7f7 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 303a7ff6bfd2eeb3120164d9cc185e0973d600de..b81dbf9ffb77b3f28a9b0ad872341fdad3656ca6 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 d64f8e6f75ab19f889c4cf93586f66bb64008e37..eda733d30455d18bd97bb565d2df8540cd1eb4a4 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 4a4d02c09112f06861ba95aef761c31b9e429444..386cbd13eaf422213f929e9aca9a81e0610348a7 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