Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r: move include/asm-m32r/* to arch/m32r/include/asm/ m32r: move include/asm-m32r headers to arch/m32r/include/asm

Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r: move include/asm-m32r/* to arch/m32r/include/asm/ m32r: move include/asm-m32r headers to arch/m32r/include/asm
4dc8ab86 · Linus Torvalds · b9836e08 · 78a49990 · 4dc8ab86 · 4dc8ab86
Commit 4dc8ab86 authored Apr 17, 2009 by Linus Torvalds
110 changed files
--- a/include/asm-m32r/Kbuild
+++ b/include/asm-m32r/Kbuild
--- a/include/asm-m32r/addrspace.h
+++ b/include/asm-m32r/addrspace.h
--- a/include/asm-m32r/assembler.h
+++ b/include/asm-m32r/assembler.h
--- a/include/asm-m32r/atomic.h
+++ b/include/asm-m32r/atomic.h
--- a/include/asm-m32r/auxvec.h
+++ b/include/asm-m32r/auxvec.h
--- a/include/asm-m32r/bitops.h
+++ b/include/asm-m32r/bitops.h
--- a/include/asm-m32r/bug.h
+++ b/include/asm-m32r/bug.h
--- a/include/asm-m32r/bugs.h
+++ b/include/asm-m32r/bugs.h
--- a/include/asm-m32r/byteorder.h
+++ b/include/asm-m32r/byteorder.h
--- a/include/asm-m32r/cache.h
+++ b/include/asm-m32r/cache.h
--- a/include/asm-m32r/cachectl.h
+++ b/include/asm-m32r/cachectl.h
--- a/include/asm-m32r/cacheflush.h
+++ b/include/asm-m32r/cacheflush.h
--- a/include/asm-m32r/checksum.h
+++ b/include/asm-m32r/checksum.h
--- a/include/asm-m32r/cputime.h
+++ b/include/asm-m32r/cputime.h
--- a/include/asm-m32r/current.h
+++ b/include/asm-m32r/current.h
--- a/include/asm-m32r/delay.h
+++ b/include/asm-m32r/delay.h
--- a/include/asm-m32r/device.h
+++ b/include/asm-m32r/device.h
--- a/include/asm-m32r/div64.h
+++ b/include/asm-m32r/div64.h
--- a/include/asm-m32r/dma.h
+++ b/include/asm-m32r/dma.h
--- a/include/asm-m32r/elf.h
+++ b/include/asm-m32r/elf.h
--- a/include/asm-m32r/emergency-restart.h
+++ b/include/asm-m32r/emergency-restart.h
--- a/include/asm-m32r/errno.h
+++ b/include/asm-m32r/errno.h
--- a/include/asm-m32r/fb.h
+++ b/include/asm-m32r/fb.h
--- a/include/asm-m32r/fcntl.h
+++ b/include/asm-m32r/fcntl.h
--- a/include/asm-m32r/flat.h
+++ b/include/asm-m32r/flat.h
--- a/include/asm-m32r/ftrace.h
+++ b/include/asm-m32r/ftrace.h
--- a/include/asm-m32r/futex.h
+++ b/include/asm-m32r/futex.h
--- a/include/asm-m32r/hardirq.h
+++ b/include/asm-m32r/hardirq.h
--- a/include/asm-m32r/hw_irq.h
+++ b/include/asm-m32r/hw_irq.h
--- a/include/asm-m32r/io.h
+++ b/include/asm-m32r/io.h
--- a/include/asm-m32r/ioctl.h
+++ b/include/asm-m32r/ioctl.h
--- a/include/asm-m32r/ioctls.h
+++ b/include/asm-m32r/ioctls.h
--- a/include/asm-m32r/ipcbuf.h
+++ b/include/asm-m32r/ipcbuf.h
--- a/include/asm-m32r/irq.h
+++ b/include/asm-m32r/irq.h
--- a/include/asm-m32r/irq_regs.h
+++ b/include/asm-m32r/irq_regs.h
--- a/include/asm-m32r/kdebug.h
+++ b/include/asm-m32r/kdebug.h
--- a/include/asm-m32r/kmap_types.h
+++ b/include/asm-m32r/kmap_types.h
--- a/include/asm-m32r/linkage.h
+++ b/include/asm-m32r/linkage.h
--- a/include/asm-m32r/local.h
+++ b/include/asm-m32r/local.h
--- a/include/asm-m32r/m32102.h
+++ b/include/asm-m32r/m32102.h
--- a/include/asm-m32r/m32104ut/m32104ut_pld.h
+++ b/include/asm-m32r/m32104ut/m32104ut_pld.h
--- a/include/asm-m32r/m32700ut/m32700ut_lan.h
+++ b/include/asm-m32r/m32700ut/m32700ut_lan.h
--- a/include/asm-m32r/m32700ut/m32700ut_lcd.h
+++ b/include/asm-m32r/m32700ut/m32700ut_lcd.h
--- a/include/asm-m32r/m32700ut/m32700ut_pld.h
+++ b/include/asm-m32r/m32700ut/m32700ut_pld.h
--- a/include/asm-m32r/m32r.h
+++ b/include/asm-m32r/m32r.h
--- a/include/asm-m32r/m32r_mp_fpga.h
+++ b/include/asm-m32r/m32r_mp_fpga.h
--- a/include/asm-m32r/mappi2/mappi2_pld.h
+++ b/include/asm-m32r/mappi2/mappi2_pld.h
--- a/include/asm-m32r/mappi3/mappi3_pld.h
+++ b/include/asm-m32r/mappi3/mappi3_pld.h
--- a/include/asm-m32r/mc146818rtc.h
+++ b/include/asm-m32r/mc146818rtc.h
--- a/include/asm-m32r/mman.h
+++ b/include/asm-m32r/mman.h
--- a/include/asm-m32r/mmu.h
+++ b/include/asm-m32r/mmu.h
--- a/include/asm-m32r/mmu_context.h
+++ b/include/asm-m32r/mmu_context.h
--- a/include/asm-m32r/mmzone.h
+++ b/include/asm-m32r/mmzone.h
--- a/include/asm-m32r/module.h
+++ b/include/asm-m32r/module.h
--- a/include/asm-m32r/msgbuf.h
+++ b/include/asm-m32r/msgbuf.h
--- a/include/asm-m32r/mutex.h
+++ b/include/asm-m32r/mutex.h
--- a/include/asm-m32r/opsput/opsput_lan.h
+++ b/include/asm-m32r/opsput/opsput_lan.h
--- a/include/asm-m32r/opsput/opsput_lcd.h
+++ b/include/asm-m32r/opsput/opsput_lcd.h
--- a/include/asm-m32r/opsput/opsput_pld.h
+++ b/include/asm-m32r/opsput/opsput_pld.h
--- a/include/asm-m32r/page.h
+++ b/include/asm-m32r/page.h
--- a/include/asm-m32r/param.h
+++ b/include/asm-m32r/param.h
--- a/include/asm-m32r/pci.h
+++ b/include/asm-m32r/pci.h
--- a/include/asm-m32r/percpu.h
+++ b/include/asm-m32r/percpu.h
--- a/include/asm-m32r/pgalloc.h
+++ b/include/asm-m32r/pgalloc.h
--- a/include/asm-m32r/pgtable-2level.h
+++ b/include/asm-m32r/pgtable-2level.h
--- a/include/asm-m32r/pgtable.h
+++ b/include/asm-m32r/pgtable.h
--- a/include/asm-m32r/poll.h
+++ b/include/asm-m32r/poll.h
--- a/include/asm-m32r/posix_types.h
+++ b/include/asm-m32r/posix_types.h
--- a/include/asm-m32r/processor.h
+++ b/include/asm-m32r/processor.h
--- a/include/asm-m32r/ptrace.h
+++ b/include/asm-m32r/ptrace.h
--- a/include/asm-m32r/resource.h
+++ b/include/asm-m32r/resource.h
--- a/include/asm-m32r/rtc.h
+++ b/include/asm-m32r/rtc.h
--- a/include/asm-m32r/s1d13806.h
+++ b/include/asm-m32r/s1d13806.h
--- a/include/asm-m32r/scatterlist.h
+++ b/include/asm-m32r/scatterlist.h
--- a/include/asm-m32r/sections.h
+++ b/include/asm-m32r/sections.h
--- a/include/asm-m32r/segment.h
+++ b/include/asm-m32r/segment.h
--- a/include/asm-m32r/sembuf.h
+++ b/include/asm-m32r/sembuf.h
--- a/include/asm-m32r/serial.h
+++ b/include/asm-m32r/serial.h
--- a/include/asm-m32r/setup.h
+++ b/include/asm-m32r/setup.h
--- a/include/asm-m32r/shmbuf.h
+++ b/include/asm-m32r/shmbuf.h
--- a/include/asm-m32r/shmparam.h
+++ b/include/asm-m32r/shmparam.h
--- a/include/asm-m32r/sigcontext.h
+++ b/include/asm-m32r/sigcontext.h
--- a/include/asm-m32r/siginfo.h
+++ b/include/asm-m32r/siginfo.h
--- a/include/asm-m32r/signal.h
+++ b/include/asm-m32r/signal.h
--- a/include/asm-m32r/smp.h
+++ b/include/asm-m32r/smp.h
--- a/include/asm-m32r/socket.h
+++ b/include/asm-m32r/socket.h
--- a/include/asm-m32r/sockios.h
+++ b/include/asm-m32r/sockios.h
--- a/include/asm-m32r/spinlock.h
+++ b/include/asm-m32r/spinlock.h
--- a/include/asm-m32r/spinlock_types.h
+++ b/include/asm-m32r/spinlock_types.h
--- a/include/asm-m32r/stat.h
+++ b/include/asm-m32r/stat.h
--- a/include/asm-m32r/statfs.h
+++ b/include/asm-m32r/statfs.h
--- a/include/asm-m32r/string.h
+++ b/include/asm-m32r/string.h
--- a/include/asm-m32r/swab.h
+++ b/include/asm-m32r/swab.h
--- a/include/asm-m32r/syscall.h
+++ b/include/asm-m32r/syscall.h
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
--- a/include/asm-m32r/termbits.h
+++ b/include/asm-m32r/termbits.h
--- a/include/asm-m32r/termios.h
+++ b/include/asm-m32r/termios.h
--- a/include/asm-m32r/thread_info.h
+++ b/include/asm-m32r/thread_info.h
--- a/include/asm-m32r/timex.h
+++ b/include/asm-m32r/timex.h
--- a/include/asm-m32r/tlb.h
+++ b/include/asm-m32r/tlb.h
--- a/include/asm-m32r/tlbflush.h
+++ b/include/asm-m32r/tlbflush.h
--- a/include/asm-m32r/topology.h
+++ b/include/asm-m32r/topology.h
--- a/include/asm-m32r/types.h
+++ b/include/asm-m32r/types.h
--- a/include/asm-m32r/uaccess.h
+++ b/include/asm-m32r/uaccess.h
--- a/include/asm-m32r/ucontext.h
+++ b/include/asm-m32r/ucontext.h
--- a/include/asm-m32r/unaligned.h
+++ b/include/asm-m32r/unaligned.h
--- a/include/asm-m32r/unistd.h
+++ b/include/asm-m32r/unistd.h
--- a/include/asm-m32r/user.h
+++ b/include/asm-m32r/user.h
--- a/include/asm-m32r/vga.h
+++ b/include/asm-m32r/vga.h
--- a/include/asm-m32r/xor.h
+++ b/include/asm-m32r/xor.h