aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-10 10:01:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-10 10:01:49 -0700
commitd848223808c5d21e1b3cea090047e34722c6254b (patch)
treea869974378be9c20f311ad3d934eb3946e813a1a
parent5de4c51d2a859a1556b7d20ae1278c3e2d70a79b (diff)
parent2f2a2132ff056bb45697dc855eb4fd95b70b38cb (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300: Separate out the proc- and unit-specific header directories from the general Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.
-rw-r--r--arch/mn10300/Makefile40
-rw-r--r--arch/mn10300/include/asm/Kbuild (renamed from include/asm-mn10300/Kbuild)0
-rw-r--r--arch/mn10300/include/asm/atomic.h (renamed from include/asm-mn10300/atomic.h)0
-rw-r--r--arch/mn10300/include/asm/auxvec.h (renamed from include/asm-mn10300/auxvec.h)0
-rw-r--r--arch/mn10300/include/asm/bitops.h (renamed from include/asm-mn10300/bitops.h)0
-rw-r--r--arch/mn10300/include/asm/bug.h (renamed from include/asm-mn10300/bug.h)0
-rw-r--r--arch/mn10300/include/asm/bugs.h (renamed from include/asm-mn10300/bugs.h)0
-rw-r--r--arch/mn10300/include/asm/busctl-regs.h (renamed from include/asm-mn10300/busctl-regs.h)0
-rw-r--r--arch/mn10300/include/asm/byteorder.h (renamed from include/asm-mn10300/byteorder.h)0
-rw-r--r--arch/mn10300/include/asm/cache.h (renamed from include/asm-mn10300/cache.h)2
-rw-r--r--arch/mn10300/include/asm/cacheflush.h (renamed from include/asm-mn10300/cacheflush.h)0
-rw-r--r--arch/mn10300/include/asm/checksum.h (renamed from include/asm-mn10300/checksum.h)0
-rw-r--r--arch/mn10300/include/asm/cpu-regs.h (renamed from include/asm-mn10300/cpu-regs.h)0
-rw-r--r--arch/mn10300/include/asm/cputime.h (renamed from include/asm-mn10300/cputime.h)0
-rw-r--r--arch/mn10300/include/asm/current.h (renamed from include/asm-mn10300/current.h)0
-rw-r--r--arch/mn10300/include/asm/delay.h (renamed from include/asm-mn10300/delay.h)0
-rw-r--r--arch/mn10300/include/asm/device.h (renamed from include/asm-mn10300/device.h)0
-rw-r--r--arch/mn10300/include/asm/div64.h (renamed from include/asm-mn10300/div64.h)0
-rw-r--r--arch/mn10300/include/asm/dma-mapping.h (renamed from include/asm-mn10300/dma-mapping.h)0
-rw-r--r--arch/mn10300/include/asm/dma.h (renamed from include/asm-mn10300/dma.h)0
-rw-r--r--arch/mn10300/include/asm/dmactl-regs.h (renamed from include/asm-mn10300/dmactl-regs.h)0
-rw-r--r--arch/mn10300/include/asm/elf.h (renamed from include/asm-mn10300/elf.h)0
-rw-r--r--arch/mn10300/include/asm/emergency-restart.h (renamed from include/asm-mn10300/emergency-restart.h)0
-rw-r--r--arch/mn10300/include/asm/errno.h (renamed from include/asm-mn10300/errno.h)0
-rw-r--r--arch/mn10300/include/asm/exceptions.h (renamed from include/asm-mn10300/exceptions.h)0
-rw-r--r--arch/mn10300/include/asm/fb.h (renamed from include/asm-mn10300/fb.h)0
-rw-r--r--arch/mn10300/include/asm/fcntl.h (renamed from include/asm-mn10300/fcntl.h)0
-rw-r--r--arch/mn10300/include/asm/fpu.h (renamed from include/asm-mn10300/fpu.h)0
-rw-r--r--arch/mn10300/include/asm/frame.inc (renamed from include/asm-mn10300/frame.inc)0
-rw-r--r--arch/mn10300/include/asm/ftrace.h (renamed from include/asm-mn10300/ftrace.h)0
-rw-r--r--arch/mn10300/include/asm/futex.h (renamed from include/asm-mn10300/futex.h)0
-rw-r--r--arch/mn10300/include/asm/gdb-stub.h (renamed from include/asm-mn10300/gdb-stub.h)0
-rw-r--r--arch/mn10300/include/asm/hardirq.h (renamed from include/asm-mn10300/hardirq.h)0
-rw-r--r--arch/mn10300/include/asm/highmem.h (renamed from include/asm-mn10300/highmem.h)0
-rw-r--r--arch/mn10300/include/asm/hw_irq.h (renamed from include/asm-mn10300/hw_irq.h)0
-rw-r--r--arch/mn10300/include/asm/intctl-regs.h (renamed from include/asm-mn10300/intctl-regs.h)0
-rw-r--r--arch/mn10300/include/asm/io.h (renamed from include/asm-mn10300/io.h)0
-rw-r--r--arch/mn10300/include/asm/ioctl.h (renamed from include/asm-mn10300/ioctl.h)0
-rw-r--r--arch/mn10300/include/asm/ioctls.h (renamed from include/asm-mn10300/ioctls.h)0
-rw-r--r--arch/mn10300/include/asm/ipc.h (renamed from include/asm-mn10300/ipc.h)0
-rw-r--r--arch/mn10300/include/asm/ipcbuf.h (renamed from include/asm-mn10300/ipcbuf.h)0
-rw-r--r--arch/mn10300/include/asm/irq.h (renamed from include/asm-mn10300/irq.h)2
-rw-r--r--arch/mn10300/include/asm/irq_regs.h (renamed from include/asm-mn10300/irq_regs.h)0
-rw-r--r--arch/mn10300/include/asm/kdebug.h (renamed from include/asm-mn10300/kdebug.h)0
-rw-r--r--arch/mn10300/include/asm/kmap_types.h (renamed from include/asm-mn10300/kmap_types.h)0
-rw-r--r--arch/mn10300/include/asm/kprobes.h (renamed from include/asm-mn10300/kprobes.h)0
-rw-r--r--arch/mn10300/include/asm/linkage.h (renamed from include/asm-mn10300/linkage.h)0
-rw-r--r--arch/mn10300/include/asm/local.h (renamed from include/asm-mn10300/local.h)0
-rw-r--r--arch/mn10300/include/asm/mc146818rtc.h (renamed from include/asm-mn10300/mc146818rtc.h)0
-rw-r--r--arch/mn10300/include/asm/mman.h (renamed from include/asm-mn10300/mman.h)0
-rw-r--r--arch/mn10300/include/asm/mmu.h (renamed from include/asm-mn10300/mmu.h)0
-rw-r--r--arch/mn10300/include/asm/mmu_context.h (renamed from include/asm-mn10300/mmu_context.h)0
-rw-r--r--arch/mn10300/include/asm/module.h (renamed from include/asm-mn10300/module.h)0
-rw-r--r--arch/mn10300/include/asm/msgbuf.h (renamed from include/asm-mn10300/msgbuf.h)0
-rw-r--r--arch/mn10300/include/asm/mutex.h (renamed from include/asm-mn10300/mutex.h)0
-rw-r--r--arch/mn10300/include/asm/nmi.h (renamed from include/asm-mn10300/nmi.h)0
-rw-r--r--arch/mn10300/include/asm/page.h (renamed from include/asm-mn10300/page.h)0
-rw-r--r--arch/mn10300/include/asm/page_offset.h (renamed from include/asm-mn10300/page_offset.h)0
-rw-r--r--arch/mn10300/include/asm/param.h (renamed from include/asm-mn10300/param.h)0
-rw-r--r--arch/mn10300/include/asm/pci.h (renamed from include/asm-mn10300/pci.h)0
-rw-r--r--arch/mn10300/include/asm/percpu.h (renamed from include/asm-mn10300/percpu.h)0
-rw-r--r--arch/mn10300/include/asm/pgalloc.h (renamed from include/asm-mn10300/pgalloc.h)0
-rw-r--r--arch/mn10300/include/asm/pgtable.h (renamed from include/asm-mn10300/pgtable.h)0
-rw-r--r--arch/mn10300/include/asm/pio-regs.h (renamed from include/asm-mn10300/pio-regs.h)0
-rw-r--r--arch/mn10300/include/asm/poll.h (renamed from include/asm-mn10300/poll.h)0
-rw-r--r--arch/mn10300/include/asm/posix_types.h (renamed from include/asm-mn10300/posix_types.h)0
-rw-r--r--arch/mn10300/include/asm/processor.h (renamed from include/asm-mn10300/processor.h)0
-rw-r--r--arch/mn10300/include/asm/ptrace.h (renamed from include/asm-mn10300/ptrace.h)0
-rw-r--r--arch/mn10300/include/asm/reset-regs.h (renamed from include/asm-mn10300/reset-regs.h)0
-rw-r--r--arch/mn10300/include/asm/resource.h (renamed from include/asm-mn10300/resource.h)0
-rw-r--r--arch/mn10300/include/asm/rtc-regs.h (renamed from include/asm-mn10300/rtc-regs.h)0
-rw-r--r--arch/mn10300/include/asm/rtc.h (renamed from include/asm-mn10300/rtc.h)0
-rw-r--r--arch/mn10300/include/asm/scatterlist.h (renamed from include/asm-mn10300/scatterlist.h)0
-rw-r--r--arch/mn10300/include/asm/sections.h (renamed from include/asm-mn10300/sections.h)0
-rw-r--r--arch/mn10300/include/asm/sembuf.h (renamed from include/asm-mn10300/sembuf.h)0
-rw-r--r--arch/mn10300/include/asm/serial-regs.h (renamed from include/asm-mn10300/serial-regs.h)0
-rw-r--r--arch/mn10300/include/asm/serial.h (renamed from include/asm-mn10300/serial.h)2
-rw-r--r--arch/mn10300/include/asm/setup.h (renamed from include/asm-mn10300/setup.h)0
-rw-r--r--arch/mn10300/include/asm/shmbuf.h (renamed from include/asm-mn10300/shmbuf.h)0
-rw-r--r--arch/mn10300/include/asm/shmparam.h (renamed from include/asm-mn10300/shmparam.h)0
-rw-r--r--arch/mn10300/include/asm/sigcontext.h (renamed from include/asm-mn10300/sigcontext.h)0
-rw-r--r--arch/mn10300/include/asm/siginfo.h (renamed from include/asm-mn10300/siginfo.h)0
-rw-r--r--arch/mn10300/include/asm/signal.h (renamed from include/asm-mn10300/signal.h)0
-rw-r--r--arch/mn10300/include/asm/smp.h (renamed from include/asm-mn10300/smp.h)0
-rw-r--r--arch/mn10300/include/asm/socket.h (renamed from include/asm-mn10300/socket.h)0
-rw-r--r--arch/mn10300/include/asm/sockios.h (renamed from include/asm-mn10300/sockios.h)0
-rw-r--r--arch/mn10300/include/asm/spinlock.h (renamed from include/asm-mn10300/spinlock.h)0
-rw-r--r--arch/mn10300/include/asm/stat.h (renamed from include/asm-mn10300/stat.h)0
-rw-r--r--arch/mn10300/include/asm/statfs.h (renamed from include/asm-mn10300/statfs.h)0
-rw-r--r--arch/mn10300/include/asm/string.h (renamed from include/asm-mn10300/string.h)0
-rw-r--r--arch/mn10300/include/asm/swab.h (renamed from include/asm-mn10300/swab.h)0
-rw-r--r--arch/mn10300/include/asm/system.h (renamed from include/asm-mn10300/system.h)0
-rw-r--r--arch/mn10300/include/asm/termbits.h (renamed from include/asm-mn10300/termbits.h)0
-rw-r--r--arch/mn10300/include/asm/termios.h (renamed from include/asm-mn10300/termios.h)0
-rw-r--r--arch/mn10300/include/asm/thread_info.h (renamed from include/asm-mn10300/thread_info.h)0
-rw-r--r--arch/mn10300/include/asm/timer-regs.h (renamed from include/asm-mn10300/timer-regs.h)0
-rw-r--r--arch/mn10300/include/asm/timex.h (renamed from include/asm-mn10300/timex.h)2
-rw-r--r--arch/mn10300/include/asm/tlb.h (renamed from include/asm-mn10300/tlb.h)0
-rw-r--r--arch/mn10300/include/asm/tlbflush.h (renamed from include/asm-mn10300/tlbflush.h)0
-rw-r--r--arch/mn10300/include/asm/topology.h (renamed from include/asm-mn10300/topology.h)0
-rw-r--r--arch/mn10300/include/asm/types.h (renamed from include/asm-mn10300/types.h)0
-rw-r--r--arch/mn10300/include/asm/uaccess.h (renamed from include/asm-mn10300/uaccess.h)0
-rw-r--r--arch/mn10300/include/asm/ucontext.h (renamed from include/asm-mn10300/ucontext.h)0
-rw-r--r--arch/mn10300/include/asm/unaligned.h (renamed from include/asm-mn10300/unaligned.h)0
-rw-r--r--arch/mn10300/include/asm/unistd.h (renamed from include/asm-mn10300/unistd.h)0
-rw-r--r--arch/mn10300/include/asm/user.h (renamed from include/asm-mn10300/user.h)0
-rw-r--r--arch/mn10300/include/asm/vga.h (renamed from include/asm-mn10300/vga.h)0
-rw-r--r--arch/mn10300/include/asm/xor.h (renamed from include/asm-mn10300/xor.h)0
-rw-r--r--arch/mn10300/kernel/entry.S2
-rw-r--r--arch/mn10300/kernel/gdb-io-serial-low.S2
-rw-r--r--arch/mn10300/kernel/gdb-io-serial.c2
-rw-r--r--arch/mn10300/kernel/gdb-io-ttysm-low.S2
-rw-r--r--arch/mn10300/kernel/gdb-io-ttysm.c2
-rw-r--r--arch/mn10300/kernel/gdb-stub.c4
-rw-r--r--arch/mn10300/kernel/head.S2
-rw-r--r--arch/mn10300/kernel/mn10300-serial-low.S4
-rw-r--r--arch/mn10300/kernel/mn10300-serial.c2
-rw-r--r--arch/mn10300/kernel/mn10300-watchdog.c2
-rw-r--r--arch/mn10300/kernel/setup.c2
-rw-r--r--arch/mn10300/kernel/traps.c2
-rw-r--r--arch/mn10300/proc-mn103e010/include/proc/cache.h (renamed from include/asm-mn10300/proc-mn103e010/cache.h)0
-rw-r--r--arch/mn10300/proc-mn103e010/include/proc/clock.h (renamed from include/asm-mn10300/proc-mn103e010/clock.h)2
-rw-r--r--arch/mn10300/proc-mn103e010/include/proc/irq.h (renamed from include/asm-mn10300/proc-mn103e010/irq.h)0
-rw-r--r--arch/mn10300/proc-mn103e010/include/proc/proc.h (renamed from include/asm-mn10300/proc-mn103e010/proc.h)0
-rw-r--r--