sh: migrate to arch/sh/include/
Paul Mundt [Mon, 28 Jul 2008 23:09:44 +0000 (08:09 +0900)]
This follows the sparc changes a439fe51a1f8eb087c22dd24d69cebae4a3addac.

Most of the moving about was done with Sam's directions at:

http://marc.info/?l=linux-sh&m=121724823706062&w=2

with subsequent hacking and fixups entirely my fault.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

297 files changed:
arch/sh/Makefile
arch/sh/boards/cayman/irq.c
arch/sh/boards/cayman/setup.c
arch/sh/boards/dreamcast/irq.c
arch/sh/boards/dreamcast/setup.c
arch/sh/boards/hp6xx/pm.c
arch/sh/boards/hp6xx/pm_wakeup.S
arch/sh/boards/hp6xx/setup.c
arch/sh/boards/landisk/gio.c
arch/sh/boards/landisk/irq.c
arch/sh/boards/landisk/psw.c
arch/sh/boards/landisk/setup.c
arch/sh/boards/renesas/r7780rp/psw.c
arch/sh/boards/se/7343/io.c
arch/sh/boards/se/7343/setup.c
arch/sh/boards/sh03/setup.c
arch/sh/boards/snapgear/setup.c
arch/sh/boot/compressed/head_64.S
arch/sh/drivers/dma/dma-g2.c
arch/sh/drivers/dma/dma-pvr2.c
arch/sh/drivers/dma/dma-sh.c
arch/sh/drivers/dma/dma-sh.h
arch/sh/drivers/pci/fixups-dreamcast.c
arch/sh/drivers/pci/ops-cayman.c
arch/sh/drivers/pci/ops-dreamcast.c
arch/sh/drivers/pci/pci-sh5.c
arch/sh/include/asm/.gitignore [new file with mode: 0644]
arch/sh/include/asm/Kbuild [moved from include/asm-sh/Kbuild with 100% similarity]
arch/sh/include/asm/a.out.h [moved from include/asm-sh/a.out.h with 100% similarity]
arch/sh/include/asm/adc.h [moved from include/asm-sh/adc.h with 88% similarity]
arch/sh/include/asm/addrspace.h [moved from include/asm-sh/addrspace.h with 98% similarity]
arch/sh/include/asm/atomic-grb.h [moved from include/asm-sh/atomic-grb.h with 100% similarity]
arch/sh/include/asm/atomic-irq.h [moved from include/asm-sh/atomic-irq.h with 100% similarity]
arch/sh/include/asm/atomic-llsc.h [moved from include/asm-sh/atomic-llsc.h with 100% similarity]
arch/sh/include/asm/atomic.h [moved from include/asm-sh/atomic.h with 100% similarity]
arch/sh/include/asm/auxvec.h [moved from include/asm-sh/auxvec.h with 100% similarity]
arch/sh/include/asm/bitops-grb.h [moved from include/asm-sh/bitops-grb.h with 100% similarity]
arch/sh/include/asm/bitops-irq.h [moved from include/asm-sh/bitops-irq.h with 100% similarity]
arch/sh/include/asm/bitops.h [moved from include/asm-sh/bitops.h with 100% similarity]
arch/sh/include/asm/bug.h [moved from include/asm-sh/bug.h with 100% similarity]
arch/sh/include/asm/bugs.h [moved from include/asm-sh/bugs.h with 100% similarity]
arch/sh/include/asm/byteorder.h [moved from include/asm-sh/byteorder.h with 100% similarity]
arch/sh/include/asm/cache.h [moved from include/asm-sh/cache.h with 97% similarity]
arch/sh/include/asm/cacheflush.h [moved from include/asm-sh/cacheflush.h with 98% similarity]
arch/sh/include/asm/checksum.h [moved from include/asm-sh/checksum.h with 100% similarity]
arch/sh/include/asm/checksum_32.h [moved from include/asm-sh/checksum_32.h with 100% similarity]
arch/sh/include/asm/checksum_64.h [moved from include/asm-sh/checksum_64.h with 100% similarity]
arch/sh/include/asm/clock.h [moved from include/asm-sh/clock.h with 100% similarity]
arch/sh/include/asm/cmpxchg-grb.h [moved from include/asm-sh/cmpxchg-grb.h with 100% similarity]
arch/sh/include/asm/cmpxchg-irq.h [moved from include/asm-sh/cmpxchg-irq.h with 100% similarity]
arch/sh/include/asm/cpu-features.h [moved from include/asm-sh/cpu-features.h with 100% similarity]
arch/sh/include/asm/cputime.h [moved from include/asm-sh/cputime.h with 100% similarity]
arch/sh/include/asm/current.h [moved from include/asm-sh/current.h with 100% similarity]
arch/sh/include/asm/delay.h [moved from include/asm-sh/delay.h with 100% similarity]
arch/sh/include/asm/device.h [moved from include/asm-sh/device.h with 100% similarity]
arch/sh/include/asm/div64.h [moved from include/asm-sh/div64.h with 100% similarity]
arch/sh/include/asm/dma-mapping.h [moved from include/asm-sh/dma-mapping.h with 100% similarity]
arch/sh/include/asm/dma.h [moved from include/asm-sh/dma.h with 99% similarity]
arch/sh/include/asm/dmabrg.h [moved from include/asm-sh/dmabrg.h with 100% similarity]
arch/sh/include/asm/edosk7705.h [moved from include/asm-sh/edosk7705.h with 100% similarity]
arch/sh/include/asm/elf.h [moved from include/asm-sh/elf.h with 100% similarity]
arch/sh/include/asm/emergency-restart.h [moved from include/asm-sh/emergency-restart.h with 100% similarity]
arch/sh/include/asm/entry-macros.S [moved from include/asm-sh/entry-macros.S with 100% similarity]
arch/sh/include/asm/errno.h [moved from include/asm-sh/errno.h with 100% similarity]
arch/sh/include/asm/fb.h [moved from include/asm-sh/fb.h with 100% similarity]
arch/sh/include/asm/fcntl.h [moved from include/asm-sh/fcntl.h with 100% similarity]
arch/sh/include/asm/fixmap.h [moved from include/asm-sh/fixmap.h with 100% similarity]
arch/sh/include/asm/flat.h [moved from include/asm-sh/flat.h with 100% similarity]
arch/sh/include/asm/fpu.h [moved from include/asm-sh/fpu.h with 100% similarity]
arch/sh/include/asm/freq.h [moved from include/asm-sh/freq.h with 94% similarity]
arch/sh/include/asm/futex-irq.h [moved from include/asm-sh/futex-irq.h with 100% similarity]
arch/sh/include/asm/futex.h [moved from include/asm-sh/futex.h with 100% similarity]
arch/sh/include/asm/gpio.h [moved from include/asm-sh/gpio.h with 94% similarity]
arch/sh/include/asm/hardirq.h [moved from include/asm-sh/hardirq.h with 100% similarity]
arch/sh/include/asm/hd64461.h [moved from include/asm-sh/hd64461.h with 100% similarity]
arch/sh/include/asm/hd64465/gpio.h [moved from include/asm-sh/hd64465/gpio.h with 100% similarity]
arch/sh/include/asm/hd64465/hd64465.h [moved from include/asm-sh/hd64465/hd64465.h with 100% similarity]
arch/sh/include/asm/hd64465/io.h [moved from include/asm-sh/hd64465/io.h with 100% similarity]
arch/sh/include/asm/heartbeat.h [moved from include/asm-sh/heartbeat.h with 100% similarity]
arch/sh/include/asm/hp6xx.h [moved from include/asm-sh/hp6xx.h with 100% similarity]
arch/sh/include/asm/hugetlb.h [moved from include/asm-sh/hugetlb.h with 100% similarity]
arch/sh/include/asm/hw_irq.h [moved from include/asm-sh/hw_irq.h with 100% similarity]
arch/sh/include/asm/i2c-sh7760.h [moved from include/asm-sh/i2c-sh7760.h with 100% similarity]
arch/sh/include/asm/ilsel.h [moved from include/asm-sh/ilsel.h with 100% similarity]
arch/sh/include/asm/io.h [moved from include/asm-sh/io.h with 100% similarity]
arch/sh/include/asm/io_generic.h [moved from include/asm-sh/io_generic.h with 100% similarity]
arch/sh/include/asm/io_trapped.h [moved from include/asm-sh/io_trapped.h with 100% similarity]
arch/sh/include/asm/ioctl.h [moved from include/asm-sh/ioctl.h with 100% similarity]
arch/sh/include/asm/ioctls.h [moved from include/asm-sh/ioctls.h with 100% similarity]
arch/sh/include/asm/ipcbuf.h [moved from include/asm-sh/ipcbuf.h with 100% similarity]
arch/sh/include/asm/irq.h [moved from include/asm-sh/irq.h with 97% similarity]
arch/sh/include/asm/irq_regs.h [moved from include/asm-sh/irq_regs.h with 100% similarity]
arch/sh/include/asm/irqflags.h [moved from include/asm-sh/irqflags.h with 100% similarity]
arch/sh/include/asm/irqflags_32.h [moved from include/asm-sh/irqflags_32.h with 100% similarity]
arch/sh/include/asm/irqflags_64.h [moved from include/asm-sh/irqflags_64.h with 98% similarity]
arch/sh/include/asm/kdebug.h [moved from include/asm-sh/kdebug.h with 100% similarity]
arch/sh/include/asm/kexec.h [moved from include/asm-sh/kexec.h with 100% similarity]
arch/sh/include/asm/kgdb.h [moved from include/asm-sh/kgdb.h with 100% similarity]
arch/sh/include/asm/kmap_types.h [moved from include/asm-sh/kmap_types.h with 100% similarity]
arch/sh/include/asm/lboxre2.h [moved from include/asm-sh/lboxre2.h with 100% similarity]
arch/sh/include/asm/linkage.h [moved from include/asm-sh/linkage.h with 100% similarity]
arch/sh/include/asm/local.h [moved from include/asm-sh/local.h with 100% similarity]
arch/sh/include/asm/machvec.h [moved from include/asm-sh/machvec.h with 100% similarity]
arch/sh/include/asm/magicpanelr2.h [moved from include/asm-sh/magicpanelr2.h with 100% similarity]
arch/sh/include/asm/mc146818rtc.h [moved from include/asm-sh/mc146818rtc.h with 100% similarity]
arch/sh/include/asm/microdev.h [moved from include/asm-sh/microdev.h with 100% similarity]
arch/sh/include/asm/migor.h [moved from include/asm-sh/migor.h with 100% similarity]
arch/sh/include/asm/mman.h [moved from include/asm-sh/mman.h with 100% similarity]
arch/sh/include/asm/mmu.h [moved from include/asm-sh/mmu.h with 100% similarity]
arch/sh/include/asm/mmu_context.h [moved from include/asm-sh/mmu_context.h with 99% similarity]
arch/sh/include/asm/mmu_context_32.h [moved from include/asm-sh/mmu_context_32.h with 100% similarity]
arch/sh/include/asm/mmu_context_64.h [moved from include/asm-sh/mmu_context_64.h with 98% similarity]
arch/sh/include/asm/mmzone.h [moved from include/asm-sh/mmzone.h with 100% similarity]
arch/sh/include/asm/module.h [moved from include/asm-sh/module.h with 100% similarity]
arch/sh/include/asm/msgbuf.h [moved from include/asm-sh/msgbuf.h with 100% similarity]
arch/sh/include/asm/mutex.h [moved from include/asm-sh/mutex.h with 100% similarity]
arch/sh/include/asm/page.h [moved from include/asm-sh/page.h with 100% similarity]
arch/sh/include/asm/param.h [moved from include/asm-sh/param.h with 100% similarity]
arch/sh/include/asm/parport.h [moved from include/asm-sh/parport.h with 100% similarity]
arch/sh/include/asm/pci.h [moved from include/asm-sh/pci.h with 100% similarity]
arch/sh/include/asm/percpu.h [moved from include/asm-sh/percpu.h with 100% similarity]
arch/sh/include/asm/pgalloc.h [moved from include/asm-sh/pgalloc.h with 100% similarity]
arch/sh/include/asm/pgtable.h [moved from include/asm-sh/pgtable.h with 100% similarity]
arch/sh/include/asm/pgtable_32.h [moved from include/asm-sh/pgtable_32.h with 100% similarity]
arch/sh/include/asm/pgtable_64.h [moved from include/asm-sh/pgtable_64.h with 100% similarity]
arch/sh/include/asm/pm.h [moved from include/asm-sh/pm.h with 100% similarity]
arch/sh/include/asm/poll.h [moved from include/asm-sh/poll.h with 100% similarity]
arch/sh/include/asm/posix_types.h [moved from include/asm-sh/posix_types.h with 100% similarity]
arch/sh/include/asm/posix_types_32.h [moved from include/asm-sh/posix_types_32.h with 100% similarity]
arch/sh/include/asm/posix_types_64.h [moved from include/asm-sh/posix_types_64.h with 100% similarity]
arch/sh/include/asm/processor.h [moved from include/asm-sh/processor.h with 100% similarity]
arch/sh/include/asm/processor_32.h [moved from include/asm-sh/processor_32.h with 100% similarity]
arch/sh/include/asm/processor_64.h [moved from include/asm-sh/processor_64.h with 99% similarity]
arch/sh/include/asm/ptrace.h [moved from include/asm-sh/ptrace.h with 100% similarity]
arch/sh/include/asm/push-switch.h [moved from include/asm-sh/push-switch.h with 100% similarity]
arch/sh/include/asm/r7780rp.h [moved from include/asm-sh/r7780rp.h with 100% similarity]
arch/sh/include/asm/resource.h [moved from include/asm-sh/resource.h with 100% similarity]
arch/sh/include/asm/rtc.h [moved from include/asm-sh/rtc.h with 92% similarity]
arch/sh/include/asm/rts7751r2d.h [moved from include/asm-sh/rts7751r2d.h with 100% similarity]
arch/sh/include/asm/rwsem.h [moved from include/asm-sh/rwsem.h with 100% similarity]
arch/sh/include/asm/scatterlist.h [moved from include/asm-sh/scatterlist.h with 100% similarity]
arch/sh/include/asm/sdk7780.h [moved from include/asm-sh/sdk7780.h with 100% similarity]
arch/sh/include/asm/se.h [moved from include/asm-sh/se.h with 100% similarity]
arch/sh/include/asm/se7206.h [moved from include/asm-sh/se7206.h with 100% similarity]
arch/sh/include/asm/se7343.h [moved from include/asm-sh/se7343.h with 100% similarity]
arch/sh/include/asm/se7721.h [moved from include/asm-sh/se7721.h with 100% similarity]
arch/sh/include/asm/se7722.h [moved from include/asm-sh/se7722.h with 100% similarity]
arch/sh/include/asm/se7751.h [moved from include/asm-sh/se7751.h with 100% similarity]
arch/sh/include/asm/se7780.h [moved from include/asm-sh/se7780.h with 100% similarity]
arch/sh/include/asm/sections.h [moved from include/asm-sh/sections.h with 100% similarity]
arch/sh/include/asm/segment.h [moved from include/asm-sh/segment.h with 100% similarity]
arch/sh/include/asm/sembuf.h [moved from include/asm-sh/sembuf.h with 100% similarity]
arch/sh/include/asm/serial.h [moved from include/asm-sh/serial.h with 96% similarity]
arch/sh/include/asm/setup.h [moved from include/asm-sh/setup.h with 100% similarity]
arch/sh/include/asm/sfp-machine.h [moved from include/asm-sh/sfp-machine.h with 100% similarity]
arch/sh/include/asm/sh7760fb.h [moved from include/asm-sh/sh7760fb.h with 100% similarity]
arch/sh/include/asm/sh7763rdp.h [moved from include/asm-sh/sh7763rdp.h with 100% similarity]
arch/sh/include/asm/sh7785lcr.h [moved from include/asm-sh/sh7785lcr.h with 100% similarity]
arch/sh/include/asm/sh_bios.h [moved from include/asm-sh/sh_bios.h with 100% similarity]
arch/sh/include/asm/sh_keysc.h [moved from include/asm-sh/sh_keysc.h with 100% similarity]
arch/sh/include/asm/sh_mobile_lcdc.h [moved from include/asm-sh/sh_mobile_lcdc.h with 100% similarity]
arch/sh/include/asm/shmbuf.h [moved from include/asm-sh/shmbuf.h with 100% similarity]
arch/sh/include/asm/shmin.h [moved from include/asm-sh/shmin.h with 100% similarity]
arch/sh/include/asm/shmparam.h [moved from include/asm-sh/shmparam.h with 100% similarity]
arch/sh/include/asm/sigcontext.h [moved from include/asm-sh/sigcontext.h with 100% similarity]
arch/sh/include/asm/siginfo.h [moved from include/asm-sh/siginfo.h with 100% similarity]
arch/sh/include/asm/signal.h [moved from include/asm-sh/signal.h with 100% similarity]
arch/sh/include/asm/smc37c93x.h [moved from include/asm-sh/smc37c93x.h with 100% similarity]
arch/sh/include/asm/smp.h [moved from include/asm-sh/smp.h with 100% similarity]
arch/sh/include/asm/snapgear.h [moved from include/asm-sh/snapgear.h with 100% similarity]
arch/sh/include/asm/socket.h [moved from include/asm-sh/socket.h with 100% similarity]
arch/sh/include/asm/sockios.h [moved from include/asm-sh/sockios.h with 100% similarity]
arch/sh/include/asm/sparsemem.h [moved from include/asm-sh/sparsemem.h with 100% similarity]
arch/sh/include/asm/spi.h [moved from include/asm-sh/spi.h with 100% similarity]
arch/sh/include/asm/spinlock.h [moved from include/asm-sh/spinlock.h with 100% similarity]
arch/sh/include/asm/spinlock_types.h [moved from include/asm-sh/spinlock_types.h with 100% similarity]
arch/sh/include/asm/stat.h [moved from include/asm-sh/stat.h with 100% similarity]
arch/sh/include/asm/statfs.h [moved from include/asm-sh/statfs.h with 100% similarity]
arch/sh/include/asm/string.h [moved from include/asm-sh/string.h with 100% similarity]
arch/sh/include/asm/string_32.h [moved from include/asm-sh/string_32.h with 100% similarity]
arch/sh/include/asm/string_64.h [moved from include/asm-sh/string_64.h with 100% similarity]
arch/sh/include/asm/system.h [moved from include/asm-sh/system.h with 100% similarity]
arch/sh/include/asm/system_32.h [moved from include/asm-sh/system_32.h with 100% similarity]
arch/sh/include/asm/system_64.h [moved from include/asm-sh/system_64.h with 100% similarity]
arch/sh/include/asm/systemh7751.h [moved from include/asm-sh/systemh7751.h with 100% similarity]
arch/sh/include/asm/termbits.h [moved from include/asm-sh/termbits.h with 100% similarity]
arch/sh/include/asm/termios.h [moved from include/asm-sh/termios.h with 100% similarity]
arch/sh/include/asm/thread_info.h [moved from include/asm-sh/thread_info.h with 100% similarity]
arch/sh/include/asm/timer.h [moved from include/asm-sh/timer.h with 96% similarity]
arch/sh/include/asm/timex.h [moved from include/asm-sh/timex.h with 100% similarity]
arch/sh/include/asm/titan.h [moved from include/asm-sh/titan.h with 100% similarity]
arch/sh/include/asm/tlb.h [moved from include/asm-sh/tlb.h with 100% similarity]
arch/sh/include/asm/tlb_64.h [moved from include/asm-sh/tlb_64.h with 100% similarity]
arch/sh/include/asm/tlbflush.h [moved from include/asm-sh/tlbflush.h with 100% similarity]
arch/sh/include/asm/topology.h [moved from include/asm-sh/topology.h with 100% similarity]
arch/sh/include/asm/types.h [moved from include/asm-sh/types.h with 100% similarity]
arch/sh/include/asm/uaccess.h [moved from include/asm-sh/uaccess.h with 100% similarity]
arch/sh/include/asm/uaccess_32.h [moved from include/asm-sh/uaccess_32.h with 100% similarity]
arch/sh/include/asm/uaccess_64.h [moved from include/asm-sh/uaccess_64.h with 100% similarity]
arch/sh/include/asm/ubc.h [moved from include/asm-sh/ubc.h with 98% similarity]
arch/sh/include/asm/ucontext.h [moved from include/asm-sh/ucontext.h with 100% similarity]
arch/sh/include/asm/unaligned.h [moved from include/asm-sh/unaligned.h with 100% similarity]
arch/sh/include/asm/unistd.h [moved from include/asm-sh/unistd.h with 100% similarity]
arch/sh/include/asm/unistd_32.h [moved from include/asm-sh/unistd_32.h with 100% similarity]
arch/sh/include/asm/unistd_64.h [moved from include/asm-sh/unistd_64.h with 100% similarity]
arch/sh/include/asm/user.h [moved from include/asm-sh/user.h with 100% similarity]
arch/sh/include/asm/vga.h [moved from include/asm-sh/vga.h with 100% similarity]
arch/sh/include/asm/watchdog.h [moved from include/asm-sh/watchdog.h with 96% similarity]
arch/sh/include/asm/xor.h [moved from include/asm-sh/xor.h with 100% similarity]
arch/sh/include/cpu-sh2/cpu/addrspace.h [moved from include/asm-sh/cpu-sh2/addrspace.h with 100% similarity]
arch/sh/include/cpu-sh2/cpu/cache.h [moved from include/asm-sh/cpu-sh2/cache.h with 100% similarity]
arch/sh/include/cpu-sh2/cpu/cacheflush.h [copied from include/asm-sh/cpu-sh2/cacheflush.h with 100% similarity]
arch/sh/include/cpu-sh2/cpu/dma.h [copied from include/asm-sh/cpu-sh2/dma.h with 100% similarity]
arch/sh/include/cpu-sh2/cpu/freq.h [moved from include/asm-sh/cpu-sh2/freq.h with 100% similarity]
arch/sh/include/cpu-sh2/cpu/mmu_context.h [copied from include/asm-sh/cpu-sh2/mmu_context.h with 100% similarity]
arch/sh/include/cpu-sh2/cpu/rtc.h [moved from include/asm-sh/cpu-sh2/rtc.h with 100% similarity]
arch/sh/include/cpu-sh2/cpu/sigcontext.h [moved from include/asm-sh/cpu-sh2/sigcontext.h with 100% similarity]
arch/sh/include/cpu-sh2/cpu/timer.h [copied from include/asm-sh/cpu-sh2/timer.h with 100% similarity]
arch/sh/include/cpu-sh2/cpu/ubc.h [copied from include/asm-sh/cpu-sh2/ubc.h with 100% similarity]
arch/sh/include/cpu-sh2/cpu/watchdog.h [copied from include/asm-sh/cpu-sh2/watchdog.h with 100% similarity]
arch/sh/include/cpu-sh2a/cpu/addrspace.h [moved from include/asm-sh/cpu-sh2a/addrspace.h with 100% similarity]
arch/sh/include/cpu-sh2a/cpu/cache.h [moved from include/asm-sh/cpu-sh2a/cache.h with 100% similarity]
arch/sh/include/cpu-sh2a/cpu/cacheflush.h [moved from include/asm-sh/cpu-sh2/cacheflush.h with 100% similarity]
arch/sh/include/cpu-sh2a/cpu/dma.h [moved from include/asm-sh/cpu-sh2/dma.h with 100% similarity]
arch/sh/include/cpu-sh2a/cpu/freq.h [moved from include/asm-sh/cpu-sh2a/freq.h with 100% similarity]
arch/sh/include/cpu-sh2a/cpu/mmu_context.h [moved from include/asm-sh/cpu-sh2/mmu_context.h with 100% similarity]
arch/sh/include/cpu-sh2a/cpu/rtc.h [moved from include/asm-sh/cpu-sh2a/rtc.h with 100% similarity]
arch/sh/include/cpu-sh2a/cpu/timer.h [moved from include/asm-sh/cpu-sh2/timer.h with 100% similarity]
arch/sh/include/cpu-sh2a/cpu/ubc.h [moved from include/asm-sh/cpu-sh2/ubc.h with 100% similarity]
arch/sh/include/cpu-sh2a/cpu/watchdog.h [moved from include/asm-sh/cpu-sh2/watchdog.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/adc.h [moved from include/asm-sh/cpu-sh3/adc.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/addrspace.h [moved from include/asm-sh/cpu-sh3/addrspace.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/cache.h [moved from include/asm-sh/cpu-sh3/cache.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/cacheflush.h [moved from include/asm-sh/cpu-sh3/cacheflush.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/dac.h [moved from include/asm-sh/cpu-sh3/dac.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/dma.h [moved from include/asm-sh/cpu-sh3/dma.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/freq.h [moved from include/asm-sh/cpu-sh3/freq.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/gpio.h [moved from include/asm-sh/cpu-sh3/gpio.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/mmu_context.h [moved from include/asm-sh/cpu-sh3/mmu_context.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/rtc.h [moved from include/asm-sh/cpu-sh3/rtc.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/sigcontext.h [moved from include/asm-sh/cpu-sh3/sigcontext.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/timer.h [moved from include/asm-sh/cpu-sh3/timer.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/ubc.h [moved from include/asm-sh/cpu-sh3/ubc.h with 100% similarity]
arch/sh/include/cpu-sh3/cpu/watchdog.h [moved from include/asm-sh/cpu-sh3/watchdog.h with 100% similarity]
arch/sh/include/cpu-sh4/cpu/addrspace.h [moved from include/asm-sh/cpu-sh4/addrspace.h with 100% similarity]
arch/sh/include/cpu-sh4/cpu/cache.h [moved from include/asm-sh/cpu-sh4/cache.h with 100% similarity]
arch/sh/include/cpu-sh4/cpu/cacheflush.h [moved from include/asm-sh/cpu-sh4/cacheflush.h with 100% similarity]
arch/sh/include/cpu-sh4/cpu/dma-sh7780.h [moved from include/asm-sh/cpu-sh4/dma-sh7780.h with 100% similarity]
arch/sh/include/cpu-sh4/cpu/dma.h [moved from include/asm-sh/cpu-sh4/dma.h with 97% similarity]
arch/sh/include/cpu-sh4/cpu/fpu.h [moved from include/asm-sh/cpu-sh4/fpu.h with 100% similarity]
arch/sh/include/cpu-sh4/cpu/freq.h [moved from include/asm-sh/cpu-sh4/freq.h with 100% similarity]
arch/sh/include/cpu-sh4/cpu/mmu_context.h [moved from include/asm-sh/cpu-sh4/mmu_context.h with 100% similarity]
arch/sh/include/cpu-sh4/cpu/rtc.h [moved from include/asm-sh/cpu-sh4/rtc.h with 100% similarity]
arch/sh/include/cpu-sh4/cpu/sigcontext.h [moved from include/asm-sh/cpu-sh4/sigcontext.h with 100% similarity]
arch/sh/include/cpu-sh4/cpu/sq.h [moved from include/asm-sh/cpu-sh4/sq.h with 100% similarity]
arch/sh/include/cpu-sh4/cpu/timer.h [moved from include/asm-sh/cpu-sh4/timer.h with 100% similarity]
arch/sh/include/cpu-sh4/cpu/ubc.h [moved from include/asm-sh/cpu-sh4/ubc.h with 100% similarity]
arch/sh/include/cpu-sh4/cpu/watchdog.h [moved from include/asm-sh/cpu-sh4/watchdog.h with 100% similarity]
arch/sh/include/cpu-sh5/cpu/addrspace.h [moved from include/asm-sh/cpu-sh5/addrspace.h with 100% similarity]
arch/sh/include/cpu-sh5/cpu/cache.h [moved from include/asm-sh/cpu-sh5/cache.h with 100% similarity]
arch/sh/include/cpu-sh5/cpu/cacheflush.h [moved from include/asm-sh/cpu-sh5/cacheflush.h with 100% similarity]
arch/sh/include/cpu-sh5/cpu/dma.h [moved from include/asm-sh/cpu-sh5/dma.h with 100% similarity]
arch/sh/include/cpu-sh5/cpu/irq.h [moved from include/asm-sh/cpu-sh5/irq.h with 100% similarity]
arch/sh/include/cpu-sh5/cpu/mmu_context.h [moved from include/asm-sh/cpu-sh5/mmu_context.h with 100% similarity]
arch/sh/include/cpu-sh5/cpu/registers.h [moved from include/asm-sh/cpu-sh5/registers.h with 100% similarity]
arch/sh/include/cpu-sh5/cpu/rtc.h [moved from include/asm-sh/cpu-sh5/rtc.h with 100% similarity]
arch/sh/include/cpu-sh5/cpu/timer.h [moved from include/asm-sh/cpu-sh5/timer.h with 100% similarity]
arch/sh/include/mach-dreamcast/mach/dma.h [moved from include/asm-sh/dreamcast/dma.h with 100% similarity]
arch/sh/include/mach-dreamcast/mach/maple.h [moved from include/asm-sh/dreamcast/maple.h with 100% similarity]
arch/sh/include/mach-dreamcast/mach/pci.h [moved from include/asm-sh/dreamcast/pci.h with 95% similarity]
arch/sh/include/mach-dreamcast/mach/sysasic.h [moved from include/asm-sh/dreamcast/sysasic.h with 100% similarity]
arch/sh/include/mach-landisk/mach/gio.h [moved from include/asm-sh/landisk/gio.h with 100% similarity]
arch/sh/include/mach-landisk/mach/iodata_landisk.h [moved from include/asm-sh/landisk/iodata_landisk.h with 100% similarity]
arch/sh/include/mach-sh03/mach/io.h [moved from include/asm-sh/sh03/io.h with 100% similarity]
arch/sh/include/mach-sh03/mach/sh03.h [moved from include/asm-sh/sh03/sh03.h with 100% similarity]
arch/sh/kernel/cpu/irq/intc-sh5.c
arch/sh/kernel/cpu/sh2/entry.S
arch/sh/kernel/cpu/sh2a/entry.S
arch/sh/kernel/cpu/sh3/entry.S
arch/sh/kernel/cpu/sh4/fpu.c
arch/sh/kernel/cpu/sh4/softfloat.c
arch/sh/kernel/cpu/sh4/sq.c
arch/sh/kernel/cpu/sh5/entry.S
arch/sh/kernel/head_64.S
arch/sh/kernel/irq.c
arch/sh/kernel/time_64.c
arch/sh/lib64/panic.c
arch/sh/mm/fault_64.c
arch/sh/tools/Makefile
include/asm-sh/.gitignore [deleted file]
include/asm-sh/cpu-sh2a/cacheflush.h [deleted file]
include/asm-sh/cpu-sh2a/dma.h [deleted file]
include/asm-sh/cpu-sh2a/mmu_context.h [deleted file]
include/asm-sh/cpu-sh2a/timer.h [deleted file]
include/asm-sh/cpu-sh2a/ubc.h [deleted file]
include/asm-sh/cpu-sh2a/watchdog.h [deleted file]
sound/sh/aica.c

index c627e45..fbf8756 100644 (file)
@@ -91,8 +91,6 @@ LDFLAGS_vmlinux               += --defsym 'jiffies=jiffies_64+4'
 LDFLAGS                        += -EB
 endif
 
-KBUILD_CFLAGS          += -pipe $(cflags-y)
-KBUILD_AFLAGS          += $(cflags-y)
 
 head-y                 := arch/sh/kernel/init_task.o
 head-$(CONFIG_SUPERH32)        += arch/sh/kernel/head_32.o
@@ -160,57 +158,17 @@ drivers-$(CONFIG_OPROFILE)        += arch/sh/oprofile/
 
 boot := arch/sh/boot
 
-ifneq ($(KBUILD_SRC),)
-incdir-prefix  := $(srctree)/include/asm-sh/
-else
-incdir-prefix  :=
-endif
-
-#      Update machine arch and proc symlinks if something which affects
-#      them changed.  We use .arch and .mach to indicate when they were
-#      updated last, otherwise make uses the target directory mtime.
+cflags-y       += -Iarch/sh/include/$(cpuincdir-y)
+cflags-y       += $(foreach d, $(incdir-y), -Iarch/sh/include/mach-$(d))
 
-include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) \
-                    include/config/auto.conf FORCE
-       @echo '  SYMLINK include/asm-sh/cpu -> include/asm-sh/$(cpuincdir-y)'
-       $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
-       $(Q)ln -fsn $(incdir-prefix)$(cpuincdir-y) include/asm-sh/cpu
-       @touch $@
-
-#      Most boards have their own mach directories.  For the ones that
-#      don't, just reference the parent directory so the semantics are
-#      kept roughly the same.
-#
-#      When multiple boards are compiled in at the same time, preference
-#      for the mach link is given to whichever has a directory for its
-#      headers. However, this is only a workaround until platforms that
-#      can live in the same kernel image back away from relying on the
-#      mach link.
-
-include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \
-                     include/config/auto.conf FORCE
-       $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
-       $(Q)rm -f include/asm-sh/mach
-       $(Q)for i in $(incdir-y); do \
-       if [ -d $(srctree)/include/asm-sh/$$i ]; then \
-               echo -n '  SYMLINK include/asm-sh/mach -> '; \
-               echo -e "include/asm-sh/$$i"; \
-               ln -fsn $(incdir-prefix)$$i \
-                       include/asm-sh/mach; \
-       else \
-               if [ ! -d include/asm-sh/mach ]; then \
-                       echo -n '  SYMLINK include/asm-sh/mach -> '; \
-                       echo -e 'include/asm-sh'; \
-                       ln -fsn $(incdir-prefix)../asm-sh include/asm-sh/mach; \
-               fi; \
-       fi; \
-       done
-       @touch $@
+KBUILD_CFLAGS          += -pipe $(cflags-y)
+KBUILD_CPPFLAGS                += $(cflags-y)
+KBUILD_AFLAGS          += $(cflags-y)
 
 PHONY += maketools FORCE
 
 maketools:  include/linux/version.h FORCE
-       $(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h
+       $(Q)$(MAKE) $(build)=arch/sh/tools arch/sh/include/asm/machtypes.h
 
 all: $(KBUILD_IMAGE)
 
@@ -219,8 +177,7 @@ zImage uImage uImage.srec vmlinux.srec: vmlinux
 
 compressed: zImage
 
-archprepare: include/asm-sh/.cpu include/asm-sh/.mach maketools \
-            arch/sh/lib64/syscalltab.h
+archprepare: maketools arch/sh/lib64/syscalltab.h
 
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
@@ -262,6 +219,4 @@ arch/sh/lib64/syscalltab.h: arch/sh/kernel/syscalls_64.S
        $(call filechk,gen-syscalltab)
 
 CLEAN_FILES += arch/sh/lib64/syscalltab.h \
-              include/asm-sh/machtypes.h \
-              include/asm-sh/cpu include/asm-sh/.cpu \
-              include/asm-sh/mach include/asm-sh/.mach
+              arch/sh/include/asm/machtypes.h
index 30ec7be..ceb37ae 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/signal.h>
-#include <asm/cpu/irq.h>
+#include <cpu/irq.h>
 #include <asm/page.h>
 
 /* Setup for the SMSC FDC37C935 / LAN91C100FD */
index 8c9fa47..e7f9cc5 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <asm/cpu/irq.h>
+#include <cpu/irq.h>
 
 /*
  * Platform Dependent Interrupt Priorities.
index 9d0673a..67bdc33 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/irq.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/dreamcast/sysasic.h>
+#include <mach/sysasic.h>
 
 /* Dreamcast System ASIC Hardware Events -
 
index 2581c8c..14c3e57 100644 (file)
@@ -25,8 +25,8 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/rtc.h>
-#include <asm/machvec.h>
-#include <asm/mach/sysasic.h>
+#include <machvec.h>
+#include <mach/sysasic.h>
 
 extern struct hw_interrupt_type systemasic_int;
 extern void aica_time_init(void);
index d22f6ea..e96684d 100644 (file)
@@ -13,7 +13,7 @@
 #include <asm/io.h>
 #include <asm/hd64461.h>
 #include <asm/hp6xx.h>
-#include <asm/cpu/dac.h>
+#include <cpu/dac.h>
 #include <asm/pm.h>
 
 #define STBCR          0xffffff82
index 45e9bf0..44b648c 100644 (file)
@@ -8,7 +8,7 @@
  */
 
 #include <linux/linkage.h>
-#include <asm/cpu/mmu_context.h>
+#include <cpu/mmu_context.h>
 
 #define k0     r0
 #define k1     r1
index 2f414ac..475b46c 100644 (file)
@@ -16,7 +16,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/hp6xx.h>
-#include <asm/cpu/dac.h>
+#include <cpu/dac.h>
 
 #define        SCPCR   0xa4000116
 #define        SCPDR   0xa4000136
index 0c15b0a..edcde08 100644 (file)
@@ -20,8 +20,8 @@
 #include <linux/fs.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/landisk/gio.h>
-#include <asm/landisk/iodata_landisk.h>
+#include <mach/gio.h>
+#include <mach/iodata_landisk.h>
 
 #define DEVCOUNT                4
 #define GIO_MINOR              2       /* GIO minor no. */
index 2586494..d0f9378 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <asm/landisk/iodata_landisk.h>
+#include <mach/iodata_landisk.h>
 
 static void disable_landisk_irq(unsigned int irq)
 {
index 5a9b70b..4bd502c 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <asm/landisk/iodata_landisk.h>
+#include <mach/iodata_landisk.h>
 #include <asm/push-switch.h>
 
 static irqreturn_t psw_irq_handler(int irq, void *arg)
index 2b708ec..470c781 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/pm.h>
 #include <linux/mm.h>
 #include <asm/machvec.h>
-#include <asm/landisk/iodata_landisk.h>
+#include <mach/iodata_landisk.h>
 #include <asm/io.h>
 
 void init_landisk_IRQ(void);
index c844dfa..0b3e062 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <asm/mach/r7780rp.h>
+#include <mach/r7780rp.h>
 #include <asm/push-switch.h>
 
 static irqreturn_t psw_irq_handler(int irq, void *arg)
index 3a6d114..e2fae32 100644 (file)
@@ -6,7 +6,7 @@
  */
 #include <linux/kernel.h>
 #include <asm/io.h>
-#include <asm/mach/se7343.h>
+#include <mach/se7343.h>
 
 #define badio(fn, a) panic("bad i/o operation %s for %08lx.", #fn, a)
 
index 8ae718d..59dc92e 100644 (file)
@@ -1,8 +1,8 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
-#include <asm/machvec.h>
-#include <asm/mach/se7343.h>
+#include <machvec.h>
+#include <mach/se7343.h>
 #include <asm/heartbeat.h>
 #include <asm/irq.h>
 #include <asm/io.h>
index 934ac4f..cd9cff1 100644 (file)
@@ -11,8 +11,8 @@
 #include <linux/platform_device.h>
 #include <asm/io.h>
 #include <asm/rtc.h>
-#include <asm/sh03/io.h>
-#include <asm/sh03/sh03.h>
+#include <mach/io.h>
+#include <mach/sh03.h>
 #include <asm/addrspace.h>
 
 static void __init init_sh03_IRQ(void)
index 7022483..a5e349d 100644 (file)
@@ -22,7 +22,7 @@
 #include <asm/snapgear.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/cpu/timer.h>
+#include <cpu/timer.h>
 
 /*
  * EraseConfig handling functions
index f72c198..622eac3 100644 (file)
@@ -14,8 +14,8 @@
  *   Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com)
  */
 #include <asm/cache.h>
-#include <asm/cpu/mmu_context.h>
-#include <asm/cpu/registers.h>
+#include <cpu/mmu_context.h>
+#include <cpu/registers.h>
 
 /*
  * Fixed TLB entries to identity map the beginning of RAM
index 0caf11b..af7bb58 100644 (file)
@@ -14,8 +14,8 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <asm/cacheflush.h>
-#include <asm/mach/sysasic.h>
-#include <asm/mach/dma.h>
+#include <mach/sysasic.h>
+#include <mach/dma.h>
 #include <asm/dma.h>
 
 struct g2_channel {
index 838fad5..391cbe1 100644 (file)
@@ -13,8 +13,8 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
-#include <asm/mach/sysasic.h>
-#include <asm/mach/dma.h>
+#include <mach/sysasic.h>
+#include <mach/dma.h>
 #include <asm/dma.h>
 #include <asm/io.h>
 
index 71ff3d6..bd30548 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <asm/dreamcast/dma.h>
+#include <mach/dma.h>
 #include <asm/dma.h>
 #include <asm/io.h>
 #include "dma-sh.h"
index 0f591fb..b05af34 100644 (file)
@@ -11,7 +11,7 @@
 #ifndef __DMA_SH_H
 #define __DMA_SH_H
 
-#include <asm/cpu/dma.h>
+#include <cpu/dma.h>
 
 /* Definitions for the SuperH DMAC */
 #define REQ_L  0x00000000
index c446993..2bf85cf 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/mach/pci.h>
+#include <mach/pci.h>
 
 static void __init gapspci_fixup_resources(struct pci_dev *dev)
 {
index 980275f..5ccf9ea 100644 (file)
@@ -2,7 +2,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/types.h>
-#include <asm/cpu/irq.h>
+#include <cpu/irq.h>
 #include "pci-sh5.h"
 
 static inline u8 bridge_swizzle(u8 pin, u8 slot)
index f54c291..f5d2a2a 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/mach/pci.h>
+#include <mach/pci.h>
 
 static struct resource gapspci_io_resource = {
        .name   = "GAPSPCI IO",
index a00a4df..7a97438 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/delay.h>
 #include <linux/types.h>
 #include <linux/irq.h>
-#include <asm/cpu/irq.h>
+#include <cpu/irq.h>
 #include <asm/pci.h>
 #include <asm/io.h>
 #include "pci-sh5.h"
diff --git a/arch/sh/include/asm/.gitignore b/arch/sh/include/asm/.gitignore
new file mode 100644 (file)
index 0000000..378db77
--- /dev/null
@@ -0,0 +1 @@
+machtypes.h
similarity index 88%
rename from include/asm-sh/adc.h
rename to arch/sh/include/asm/adc.h
index 5f85cf7..48824c1 100644 (file)
@@ -5,7 +5,7 @@
  * Copyright (C) 2004  Andriy Skulysh
  */
 
-#include <asm/cpu/adc.h>
+#include <cpu/adc.h>
 
 int adc_single(unsigned int channel);
 
similarity index 98%
rename from include/asm-sh/addrspace.h
rename to arch/sh/include/asm/addrspace.h
index fa544fc..2702d81 100644 (file)
@@ -12,7 +12,7 @@
 
 #ifdef __KERNEL__
 
-#include <asm/cpu/addrspace.h>
+#include <cpu/addrspace.h>
 
 /* If this CPU supports segmentation, hook up the helpers */
 #ifdef P1SEG
similarity index 97%
rename from include/asm-sh/cache.h
rename to arch/sh/include/asm/cache.h
index 083419f..02df18e 100644 (file)
@@ -10,7 +10,7 @@
 #ifdef __KERNEL__
 
 #include <linux/init.h>
-#include <asm/cpu/cache.h>
+#include <cpu/cache.h>
 
 #define L1_CACHE_BYTES         (1 << L1_CACHE_SHIFT)
 
similarity index 98%
rename from include/asm-sh/cacheflush.h
rename to arch/sh/include/asm/cacheflush.h
index e034c36..09acbc3 100644 (file)
@@ -27,7 +27,7 @@
 #define __flush_purge_region(start, size)      do { (void)(start); } while (0)
 #define __flush_invalidate_region(start, size) do { (void)(start); } while (0)
 #else
-#include <asm/cpu/cacheflush.h>
+#include <cpu/cacheflush.h>
 
 /*
  * Consistent DMA requires that the __flush_xxx() primitives must be set
similarity index 99%
rename from include/asm-sh/dma.h
rename to arch/sh/include/asm/dma.h
index a65b02f..beca712 100644 (file)
@@ -15,7 +15,7 @@
 #include <linux/wait.h>
 #include <linux/sched.h>
 #include <linux/sysdev.h>
-#include <asm/cpu/dma.h>
+#include <cpu/dma.h>
 
 /* The maximum address that we can perform a DMA transfer to on this platform */
 /* Don't define MAX_DMA_ADDRESS; it's useless on the SuperH and any
similarity index 100%
rename from include/asm-sh/fb.h
rename to arch/sh/include/asm/fb.h
similarity index 94%
rename from include/asm-sh/freq.h
rename to arch/sh/include/asm/freq.h
index 39c0e09..4ece90b 100644 (file)
@@ -12,7 +12,7 @@
 #define __ASM_SH_FREQ_H
 #ifdef __KERNEL__
 
-#include <asm/cpu/freq.h>
+#include <cpu/freq.h>
 
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH_FREQ_H */
similarity index 94%
rename from include/asm-sh/gpio.h
rename to arch/sh/include/asm/gpio.h
index 9bb27e0..cf32bd2 100644 (file)
@@ -13,7 +13,7 @@
 #define __ASM_SH_GPIO_H
 
 #if defined(CONFIG_CPU_SH3)
-#include <asm/cpu/gpio.h>
+#include <cpu/gpio.h>
 #endif
 
 #endif /* __ASM_SH_GPIO_H */
similarity index 100%
rename from include/asm-sh/io.h
rename to arch/sh/include/asm/io.h
similarity index 97%
rename from include/asm-sh/irq.h
rename to arch/sh/include/asm/irq.h
index ca66e5d..6195a53 100644 (file)
@@ -51,7 +51,7 @@ extern void irq_ctx_exit(int cpu);
 #endif
 
 #ifdef CONFIG_CPU_SH5
-#include <asm/cpu/irq.h>
+#include <cpu/irq.h>
 #endif
 
 #endif /* __ASM_SH_IRQ_H */
similarity index 98%
rename from include/asm-sh/irqflags_64.h
rename to arch/sh/include/asm/irqflags_64.h
index 4f6b8a5..88f6522 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ASM_SH_IRQFLAGS_64_H
 #define __ASM_SH_IRQFLAGS_64_H
 
-#include <asm/cpu/registers.h>
+#include <cpu/registers.h>
 
 #define SR_MASK_LL     0x00000000000000f0LL
 #define SR_BL_LL       0x0000000010000000LL
similarity index 99%
rename from include/asm-sh/mmu_context.h
rename to arch/sh/include/asm/mmu_context.h
index 8589a50..04c0c97 100644 (file)
@@ -8,7 +8,7 @@
 #define __ASM_SH_MMU_CONTEXT_H
 
 #ifdef __KERNEL__
-#include <asm/cpu/mmu_context.h>
+#include <cpu/mmu_context.h>
 #include <asm/tlbflush.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
similarity index 98%
rename from include/asm-sh/mmu_context_64.h
rename to arch/sh/include/asm/mmu_context_64.h
index 9649f1c..de12102 100644 (file)
@@ -11,7 +11,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
-#include <asm/cpu/registers.h>
+#include <cpu/registers.h>
 #include <asm/cacheflush.h>
 
 #define SR_ASID_MASK           0xffffffffff00ffffULL
similarity index 100%
rename from include/asm-sh/pm.h
rename to arch/sh/include/asm/pm.h
similarity index 99%
rename from include/asm-sh/processor_64.h
rename to arch/sh/include/asm/processor_64.h
index fc7fc68..770d516 100644 (file)
@@ -19,7 +19,7 @@
 #include <asm/types.h>
 #include <asm/cache.h>
 #include <asm/ptrace.h>
-#include <asm/cpu/registers.h>
+#include <cpu/registers.h>
 
 /*
  * Default implementation of macro that returns current
similarity index 92%
rename from include/asm-sh/rtc.h
rename to arch/sh/include/asm/rtc.h
index ec45ba8..1813f42 100644 (file)
@@ -11,6 +11,6 @@ struct sh_rtc_platform_info {
        unsigned long capabilities;
 };
 
-#include <asm/cpu/rtc.h>
+#include <cpu/rtc.h>
 
 #endif /* _ASM_RTC_H */
similarity index 100%
rename from include/asm-sh/se.h
rename to arch/sh/include/asm/se.h
similarity index 96%
rename from include/asm-sh/serial.h
rename to arch/sh/include/asm/serial.h
index 21f6d33..e13cc94 100644 (file)
@@ -21,7 +21,7 @@
 #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
 
 #ifdef CONFIG_HD64465
-#include <asm/hd64465.h>
+#include <asm/hd64465/hd64465.h>
 
 #define SERIAL_PORT_DFNS                   \
         /* UART CLK   PORT IRQ     FLAGS        */                      \
similarity index 96%
rename from include/asm-sh/timer.h
rename to arch/sh/include/asm/timer.h
index 327f7eb..a7ca3a1 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <linux/sysdev.h>
 #include <linux/clocksource.h>
-#include <asm/cpu/timer.h>
+#include <cpu/timer.h>
 
 struct sys_timer_ops {
        int (*init)(void);
similarity index 98%
rename from include/asm-sh/ubc.h
rename to arch/sh/include/asm/ubc.h
index 56f4e30..a7b9028 100644 (file)
@@ -12,7 +12,7 @@
 #define __ASM_SH_UBC_H
 #ifdef __KERNEL__
 
-#include <asm/cpu/ubc.h>
+#include <cpu/ubc.h>
 
 /* User Break Controller */
 #if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709)
similarity index 96%
rename from include/asm-sh/watchdog.h
rename to arch/sh/include/asm/watchdog.h
index d19ea62..f024fed 100644 (file)
 #ifdef __KERNEL__
 
 #include <linux/types.h>
-#include <asm/cpu/watchdog.h>
+#include <cpu/watchdog.h>
 #include <asm/io.h>
 
 /* 
- * See asm/cpu-sh2/watchdog.h for explanation of this stupidity..
+ * See cpu-sh2/watchdog.h for explanation of this stupidity..
  */
 #ifndef WTCNT_R
 #  define WTCNT_R      WTCNT
similarity index 97%
rename from include/asm-sh/cpu-sh4/dma.h
rename to arch/sh/include/cpu-sh4/cpu/dma.h
index aaf71b0..235b7cd 100644 (file)
@@ -20,7 +20,7 @@
 #define CHCR_TS_MASK   0x18
 #define CHCR_TS_SHIFT  3
 
-#include <asm/cpu/dma-sh7780.h>
+#include <cpu/dma-sh7780.h>
 #else
 #define SH_DMAC_BASE   0xffa00000
 
similarity index 95%
rename from include/asm-sh/dreamcast/pci.h
rename to arch/sh/include/mach-dreamcast/mach/pci.h
index e401b24..9264ff4 100644 (file)
@@ -11,7 +11,7 @@
 #ifndef __ASM_SH_DREAMCAST_PCI_H
 #define __ASM_SH_DREAMCAST_PCI_H
 
-#include <asm/mach/sysasic.h>
+#include <mach/sysasic.h>
 
 #define        GAPSPCI_REGS            0x01001400
 #define GAPSPCI_DMA_BASE       0x01840000
index 79baa47..726f033 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
-#include <asm/cpu/irq.h>
+#include <cpu/irq.h>
 #include <asm/page.h>
 
 /*
index ee894e5..becc54c 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
-#include <asm/cpu/mmu_context.h>
+#include <cpu/mmu_context.h>
 #include <asm/unistd.h>
 #include <asm/errno.h>
 #include <asm/page.h>
index 47096dc..ab3903e 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
-#include <asm/cpu/mmu_context.h>
+#include <cpu/mmu_context.h>
 #include <asm/unistd.h>
 #include <asm/errno.h>
 #include <asm/page.h>
index 4004073..3fe482d 100644 (file)
@@ -14,7 +14,7 @@
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/unistd.h>
-#include <asm/cpu/mmu_context.h>
+#include <cpu/mmu_context.h>
 #include <asm/page.h>
 
 ! NOTE:
index 8020796..2d452f6 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/io.h>
-#include <asm/cpu/fpu.h>
+#include <cpu/fpu.h>
 #include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/fpu.h>
index 7b2d337..828cb57 100644 (file)
@@ -36,7 +36,7 @@
  * and Kamel Khelifi <kamel.khelifi@st.com>
  */
 #include <linux/kernel.h>
-#include <asm/cpu/fpu.h>
+#include <cpu/fpu.h>
 
 #define LIT64( a ) a##LL
 
index 9561b02..dcdf959 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/io.h>
 #include <asm/page.h>
 #include <asm/cacheflush.h>
-#include <asm/cpu/sq.h>
+#include <cpu/sq.h>
 
 struct sq_mapping;
 
index 05372ed..ca08e7f 100644 (file)
@@ -11,7 +11,7 @@
  */
 #include <linux/errno.h>
 #include <linux/sys.h>
-#include <asm/cpu/registers.h>
+#include <cpu/registers.h>
 #include <asm/processor.h>
 #include <asm/unistd.h>
 #include <asm/thread_info.h>
index f42d4c0..7ccfb99 100644 (file)
@@ -11,8 +11,8 @@
 #include <asm/page.h>
 #include <asm/cache.h>
 #include <asm/tlb.h>
-#include <asm/cpu/registers.h>
-#include <asm/cpu/mmu_context.h>
+#include <cpu/registers.h>
+#include <cpu/mmu_context.h>
 #include <asm/thread_info.h>
 
 /*
index a2a99e4..64b7690 100644 (file)
@@ -15,7 +15,7 @@
 #include <asm/machvec.h>
 #include <asm/uaccess.h>
 #include <asm/thread_info.h>
-#include <asm/cpu/mmu_context.h>
+#include <cpu/mmu_context.h>
 
 atomic_t irq_err_count;
 
index 022a55f..791edab 100644 (file)
@@ -33,8 +33,8 @@
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
-#include <asm/cpu/registers.h>  /* required by inline __asm__ stmt. */
-#include <asm/cpu/irq.h>
+#include <cpu/registers.h>      /* required by inline __asm__ stmt. */
+#include <cpu/irq.h>
 #include <asm/addrspace.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
index ff559e2..da32ba7 100644 (file)
@@ -8,7 +8,7 @@
 
 #include <linux/kernel.h>
 #include <asm/io.h>
-#include <asm/cpu/registers.h>
+#include <cpu/registers.h>
 
 /* THIS IS A PHYSICAL ADDRESS */
 #define HDSP2534_ADDR (0x04002100)
index 399d537..bd63b96 100644 (file)
@@ -39,7 +39,7 @@
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
-#include <asm/cpu/registers.h>
+#include <cpu/registers.h>
 
 /* Callable from fault.c, so not static */
 inline void __do_tlb_refill(unsigned long address,
index 567516b..b5d202b 100644 (file)
@@ -10,7 +10,7 @@
 # Shamelessly cloned from ARM.
 #
 
-include/asm-sh/machtypes.h: $(src)/gen-mach-types $(src)/mach-types
+arch/sh/include/asm/machtypes.h: $(src)/gen-mach-types $(src)/mach-types
        @echo '  Generating $@'
-       $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
+       $(Q)if [ ! -d arch/sh/include/asm ]; then mkdir -p arch/sh/include/asm; fi
        $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }
diff --git a/include/asm-sh/.gitignore b/include/asm-sh/.gitignore
deleted file mode 100644 (file)
index 9218ef8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-cpu
-mach
-machtypes.h
diff --git a/include/asm-sh/cpu-sh2a/cacheflush.h b/include/asm-sh/cpu-sh2a/cacheflush.h
deleted file mode 100644 (file)
index fa3186c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm/cpu-sh2/cacheflush.h>
diff --git a/include/asm-sh/cpu-sh2a/dma.h b/include/asm-sh/cpu-sh2a/dma.h
deleted file mode 100644 (file)
index 0d5ad85..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm/cpu-sh2/dma.h>
diff --git a/include/asm-sh/cpu-sh2a/mmu_context.h b/include/asm-sh/cpu-sh2a/mmu_context.h
deleted file mode 100644 (file)
index cd2387f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm/cpu-sh2/mmu_context.h>
diff --git a/include/asm-sh/cpu-sh2a/timer.h b/include/asm-sh/cpu-sh2a/timer.h
deleted file mode 100644 (file)
index fee504a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm/cpu-sh2/timer.h>
diff --git a/include/asm-sh/cpu-sh2a/ubc.h b/include/asm-sh/cpu-sh2a/ubc.h
deleted file mode 100644 (file)
index cf28062..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm/cpu-sh2/ubc.h>
diff --git a/include/asm-sh/cpu-sh2a/watchdog.h b/include/asm-sh/cpu-sh2a/watchdog.h
deleted file mode 100644 (file)
index c1b3e24..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm/cpu-sh2/watchdog.h>
index 9ca1133..54df8ba 100644 (file)
@@ -42,7 +42,7 @@
 #include <sound/info.h>
 #include <asm/io.h>
 #include <asm/dma.h>
-#include <asm/dreamcast/sysasic.h>
+#include <mach/sysasic.h>
 #include "aica.h"
 
 MODULE_AUTHOR("Adrian McMenamin <adrian@mcmen.demon.co.uk>");