Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

00e9028a · Linus Torvalds <[email protected]> · 2008-08-01 10:53:43 -07:00

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (28 commits)
  mm/hugetlb.c must #include <asm/io.h>
  video: Fix up hp6xx driver build regressions.
  sh: defconfig updates.
  sh: Kill off stray mach-rsk7203 reference.
  serial: sh-sci: Fix up SH7760/SH7780/SH7785 early printk regression.
  sh: Move out individual boards without mach groups.
  sh: Make sure AT_SYSINFO_EHDR is exposed to userspace in asm/auxvec.h.
  sh: Allow SH-3 and SH-5 to use common headers.
  sh: Provide common CPU headers, prune the SH-2 and SH-2A directories.
  sh/maple: clean maple bus code
  sh: More header path fixups for mach dir refactoring.
  sh: Move out the solution engine headers to arch/sh/include/mach-se/
  sh: I2C fix for AP325RXA and Migo-R
  sh: Shuffle the board directories in to mach groups.
  sh: dma-sh: Fix up dreamcast dma.h mach path.
  sh: Switch KBUILD_DEFCONFIG to shx3_defconfig.
  sh: Add ARCH_DEFCONFIG entries for sh and sh64.
  sh: Fix compile error of Solution Engine
  sh: Proper __put_user_asm() size mismatch fix.
  sh: Stub in a dummy ENTRY_OFFSET for uImage offset calculation.
  ...

Commit: 00e9028a95fb8a4d79f2fb695a853f33ea7d3b57
Parents: 57b1494d · 7cb93181

Merge commit. Changes below are compared with the first parent: 57b1494d.

Changes

419 files changed · +3322 −2907

File	Status	Add	Del	Content
MAINTAINERS	modified	+1	−1	View file
arch/sh/Kconfig	modified	+7	−245	View file
arch/sh/Makefile	modified	+45	−94	View file
arch/sh/boards/Kconfig	added	+258	−0	View file
arch/sh/boards/Makefile	added	+8	−0	View file
arch/sh/boards/renesas/ap325rxa/setup.c → arch/sh/boards/board-ap325rxa.c	renamed	+4	−0	View file
arch/sh/boards/magicpanelr2/setup.c → arch/sh/boards/board-magicpanelr2.c	renamed	+0	−0	View file
arch/sh/boards/renesas/rsk7203/setup.c → arch/sh/boards/board-rsk7203.c	renamed	+10	−0	View file
arch/sh/boards/renesas/sh7785lcr/setup.c → arch/sh/boards/board-sh7785lcr.c	renamed	+0	−0	View file
arch/sh/boards/shmin/setup.c → arch/sh/boards/board-shmin.c	renamed	+0	−0	View file
arch/sh/boards/cayman/Makefile → arch/sh/boards/mach-cayman/Makefile	renamed	+0	−0	View file
arch/sh/boards/cayman/irq.c → arch/sh/boards/mach-cayman/irq.c	renamed	+1	−1	View file
arch/sh/boards/cayman/led.c → arch/sh/boards/mach-cayman/led.c	renamed	+0	−0	View file
arch/sh/boards/cayman/setup.c → arch/sh/boards/mach-cayman/setup.c	renamed	+1	−1	View file
arch/sh/boards/dreamcast/Makefile → arch/sh/boards/mach-dreamcast/Makefile	renamed	+0	−0	View file
arch/sh/boards/dreamcast/irq.c → arch/sh/boards/mach-dreamcast/irq.c	renamed	+1	−1	View file
arch/sh/boards/dreamcast/rtc.c → arch/sh/boards/mach-dreamcast/rtc.c	renamed	+0	−0	View file
arch/sh/boards/dreamcast/setup.c → arch/sh/boards/mach-dreamcast/setup.c	renamed	+1	−1	View file
arch/sh/boards/renesas/edosk7705/Makefile → arch/sh/boards/mach-edosk7705/Makefile	renamed	+0	−0	View file
arch/sh/boards/renesas/edosk7705/io.c → arch/sh/boards/mach-edosk7705/io.c	renamed	+0	−0	View file
arch/sh/boards/renesas/edosk7705/setup.c → arch/sh/boards/mach-edosk7705/setup.c	renamed	+0	−0	View file
arch/sh/boards/renesas/r7780rp/Kconfig → arch/sh/boards/mach-highlander/Kconfig	renamed	+0	−0	View file
arch/sh/boards/renesas/r7780rp/Makefile → arch/sh/boards/mach-highlander/Makefile	renamed	+0	−0	View file
arch/sh/boards/renesas/r7780rp/irq-r7780mp.c → arch/sh/boards/mach-highlander/irq-r7780mp.c	renamed	+0	−0	View file
arch/sh/boards/renesas/r7780rp/irq-r7780rp.c → arch/sh/boards/mach-highlander/irq-r7780rp.c	renamed	+0	−0	View file
arch/sh/boards/renesas/r7780rp/irq-r7785rp.c → arch/sh/boards/mach-highlander/irq-r7785rp.c	renamed	+0	−0	View file
arch/sh/boards/renesas/r7780rp/psw.c → arch/sh/boards/mach-highlander/psw.c	renamed	+1	−1	View file
arch/sh/boards/renesas/r7780rp/setup.c → arch/sh/boards/mach-highlander/setup.c	renamed	+0	−0	View file
arch/sh/boards/hp6xx/Makefile → arch/sh/boards/mach-hp6xx/Makefile	renamed	+0	−0	View file
arch/sh/boards/hp6xx/hp6xx_apm.c → arch/sh/boards/mach-hp6xx/hp6xx_apm.c	renamed	+0	−0	View file
arch/sh/boards/hp6xx/pm.c → arch/sh/boards/mach-hp6xx/pm.c	renamed	+1	−1	View file
arch/sh/boards/hp6xx/pm_wakeup.S → arch/sh/boards/mach-hp6xx/pm_wakeup.S	renamed	+1	−1	View file
arch/sh/boards/hp6xx/setup.c → arch/sh/boards/mach-hp6xx/setup.c	renamed	+1	−1	View file
arch/sh/boards/landisk/Makefile → arch/sh/boards/mach-landisk/Makefile	renamed	+0	−0	View file
arch/sh/boards/landisk/gio.c → arch/sh/boards/mach-landisk/gio.c	renamed	+2	−2	View file
arch/sh/boards/landisk/irq.c → arch/sh/boards/mach-landisk/irq.c	renamed	+1	−1	View file
arch/sh/boards/landisk/psw.c → arch/sh/boards/mach-landisk/psw.c	renamed	+1	−1	View file
arch/sh/boards/landisk/setup.c → arch/sh/boards/mach-landisk/setup.c	renamed	+1	−1	View file
arch/sh/boards/lboxre2/Makefile → arch/sh/boards/mach-lboxre2/Makefile	renamed	+0	−0	View file
arch/sh/boards/lboxre2/irq.c → arch/sh/boards/mach-lboxre2/irq.c	renamed	+0	−0	View file
arch/sh/boards/lboxre2/setup.c → arch/sh/boards/mach-lboxre2/setup.c	renamed	+0	−0	View file
arch/sh/boards/superh/microdev/Makefile → arch/sh/boards/mach-microdev/Makefile	renamed	+0	−0	View file
arch/sh/boards/superh/microdev/io.c → arch/sh/boards/mach-microdev/io.c	renamed	+0	−0	View file
arch/sh/boards/superh/microdev/irq.c → arch/sh/boards/mach-microdev/irq.c	renamed	+0	−0	View file
arch/sh/boards/superh/microdev/led.c → arch/sh/boards/mach-microdev/led.c	renamed	+0	−0	View file
arch/sh/boards/superh/microdev/setup.c → arch/sh/boards/mach-microdev/setup.c	renamed	+0	−0	View file
arch/sh/boards/renesas/migor/Kconfig → arch/sh/boards/mach-migor/Kconfig	renamed	+0	−0	View file
arch/sh/boards/renesas/migor/Makefile → arch/sh/boards/mach-migor/Makefile	renamed	+0	−0	View file
arch/sh/boards/renesas/migor/lcd_qvga.c → arch/sh/boards/mach-migor/lcd_qvga.c	renamed	+0	−0	View file
arch/sh/boards/renesas/migor/setup.c → arch/sh/boards/mach-migor/setup.c	renamed	+4	−0	View file
arch/sh/boards/renesas/rts7751r2d/Kconfig → arch/sh/boards/mach-r2d/Kconfig	renamed	+0	−0	View file
arch/sh/boards/renesas/rts7751r2d/Makefile → arch/sh/boards/mach-r2d/Makefile	renamed	+0	−0	View file
arch/sh/boards/renesas/rts7751r2d/irq.c → arch/sh/boards/mach-r2d/irq.c	renamed	+0	−0	View file
arch/sh/boards/renesas/rts7751r2d/setup.c → arch/sh/boards/mach-r2d/setup.c	renamed	+0	−0	View file
arch/sh/boards/renesas/sdk7780/Kconfig → arch/sh/boards/mach-sdk7780/Kconfig	renamed	+0	−0	View file
arch/sh/boards/renesas/sdk7780/Makefile → arch/sh/boards/mach-sdk7780/Makefile	renamed	+0	−0	View file
arch/sh/boards/renesas/sdk7780/irq.c → arch/sh/boards/mach-sdk7780/irq.c	renamed	+0	−0	View file
arch/sh/boards/renesas/sdk7780/setup.c → arch/sh/boards/mach-sdk7780/setup.c	renamed	+0	−0	View file
arch/sh/boards/se/7206/Makefile → arch/sh/boards/mach-se/7206/Makefile	renamed	+0	−0	View file
arch/sh/boards/se/7206/io.c → arch/sh/boards/mach-se/7206/io.c	renamed	+1	−1	View file
arch/sh/boards/se/7206/irq.c → arch/sh/boards/mach-se/7206/irq.c	renamed	+1	−1	View file
arch/sh/boards/se/7206/setup.c → arch/sh/boards/mach-se/7206/setup.c	renamed	+1	−1	View file
arch/sh/boards/se/7343/Makefile → arch/sh/boards/mach-se/7343/Makefile	renamed	+0	−0	View file
arch/sh/boards/se/7343/io.c → arch/sh/boards/mach-se/7343/io.c	renamed	+1	−1	View file
arch/sh/boards/se/7343/irq.c → arch/sh/boards/mach-se/7343/irq.c	renamed	+3	−3	View file
arch/sh/boards/se/7343/setup.c → arch/sh/boards/mach-se/7343/setup.c	renamed	+1	−1	View file
arch/sh/boards/se/770x/Makefile → arch/sh/boards/mach-se/770x/Makefile	renamed	+0	−0	View file
arch/sh/boards/se/770x/io.c → arch/sh/boards/mach-se/770x/io.c	renamed	+1	−1	View file
arch/sh/boards/se/770x/irq.c → arch/sh/boards/mach-se/770x/irq.c	renamed	+1	−1	View file
arch/sh/boards/se/770x/setup.c → arch/sh/boards/mach-se/770x/setup.c	renamed	+7	−1	View file
arch/sh/boards/se/7721/Makefile → arch/sh/boards/mach-se/7721/Makefile	renamed	+0	−0	View file
arch/sh/boards/se/7721/irq.c → arch/sh/boards/mach-se/7721/irq.c	renamed	+1	−1	View file
arch/sh/boards/se/7721/setup.c → arch/sh/boards/mach-se/7721/setup.c	renamed	+1	−1	View file
arch/sh/boards/se/7722/Makefile → arch/sh/boards/mach-se/7722/Makefile	renamed	+0	−0	View file
arch/sh/boards/se/7722/irq.c → arch/sh/boards/mach-se/7722/irq.c	renamed	+1	−1	View file
arch/sh/boards/se/7722/setup.c → arch/sh/boards/mach-se/7722/setup.c	renamed	+1	−1	View file
arch/sh/boards/se/7751/Makefile → arch/sh/boards/mach-se/7751/Makefile	renamed	+0	−0	View file
arch/sh/boards/se/7751/io.c → arch/sh/boards/mach-se/7751/io.c	renamed	+1	−1	View file
arch/sh/boards/se/7751/irq.c → arch/sh/boards/mach-se/7751/irq.c	renamed	+1	−1	View file
arch/sh/boards/se/7751/pci.c → arch/sh/boards/mach-se/7751/pci.c	renamed	+0	−0	View file
arch/sh/boards/se/7751/setup.c → arch/sh/boards/mach-se/7751/setup.c	renamed	+1	−1	View file
arch/sh/boards/se/7780/Makefile → arch/sh/boards/mach-se/7780/Makefile	renamed	+0	−0	View file
arch/sh/boards/se/7780/irq.c → arch/sh/boards/mach-se/7780/irq.c	renamed	+1	−1	View file
arch/sh/boards/se/7780/setup.c → arch/sh/boards/mach-se/7780/setup.c	renamed	+1	−1	View file
arch/sh/boards/mach-se/Makefile	added	+9	−0	View file
arch/sh/boards/se/7619/setup.c → arch/sh/boards/mach-se/board-se7619.c	renamed	+0	−0	View file
arch/sh/boards/sh03/Makefile → arch/sh/boards/mach-sh03/Makefile	renamed	+0	−0	View file
arch/sh/boards/sh03/rtc.c → arch/sh/boards/mach-sh03/rtc.c	renamed	+0	−0	View file
arch/sh/boards/sh03/setup.c → arch/sh/boards/mach-sh03/setup.c	renamed	+2	−2	View file
arch/sh/boards/renesas/sh7763rdp/Makefile → arch/sh/boards/mach-sh7763rdp/Makefile	renamed	+0	−0	View file
arch/sh/boards/renesas/sh7763rdp/irq.c → arch/sh/boards/mach-sh7763rdp/irq.c	renamed	+0	−0	View file
arch/sh/boards/renesas/sh7763rdp/setup.c → arch/sh/boards/mach-sh7763rdp/setup.c	renamed	+0	−0	View file
arch/sh/boards/snapgear/Makefile → arch/sh/boards/mach-snapgear/Makefile	renamed	+0	−0	View file
arch/sh/boards/snapgear/io.c → arch/sh/boards/mach-snapgear/io.c	renamed	+0	−0	View file
arch/sh/boards/snapgear/setup.c → arch/sh/boards/mach-snapgear/setup.c	renamed	+1	−1	View file
arch/sh/boards/renesas/systemh/Makefile → arch/sh/boards/mach-systemh/Makefile	renamed	+0	−0	View file
arch/sh/boards/renesas/systemh/io.c → arch/sh/boards/mach-systemh/io.c	renamed	+0	−0	View file
arch/sh/boards/renesas/systemh/irq.c → arch/sh/boards/mach-systemh/irq.c	renamed	+0	−0	View file
arch/sh/boards/renesas/systemh/setup.c → arch/sh/boards/mach-systemh/setup.c	renamed	+0	−0	View file
arch/sh/boards/titan/Makefile → arch/sh/boards/mach-titan/Makefile	renamed	+0	−0	View file
arch/sh/boards/titan/io.c → arch/sh/boards/mach-titan/io.c	renamed	+0	−0	View file
arch/sh/boards/titan/setup.c → arch/sh/boards/mach-titan/setup.c	renamed	+0	−0	View file
arch/sh/boards/renesas/x3proto/Makefile → arch/sh/boards/mach-x3proto/Makefile	renamed	+0	−0	View file
arch/sh/boards/renesas/x3proto/ilsel.c → arch/sh/boards/mach-x3proto/ilsel.c	renamed	+0	−0	View file
arch/sh/boards/renesas/x3proto/setup.c → arch/sh/boards/mach-x3proto/setup.c	renamed	+0	−0	View file
arch/sh/boards/magicpanelr2/Kconfig	deleted	+0	−13	View before deletion
arch/sh/boards/magicpanelr2/Makefile	deleted	+0	−5	View before deletion
arch/sh/boards/renesas/ap325rxa/Makefile	deleted	+0	−1	View before deletion
arch/sh/boards/renesas/rsk7203/Makefile	deleted	+0	−1	View before deletion
arch/sh/boards/renesas/sh7785lcr/Makefile	deleted	+0	−1	View before deletion
arch/sh/boards/se/7619/Makefile	deleted	+0	−5	View before deletion
arch/sh/boards/shmin/Makefile	deleted	+0	−5	View before deletion
arch/sh/boot/Makefile	modified	+2	−1	View file
arch/sh/boot/compressed/head_64.S	modified	+2	−2	View file
arch/sh/configs/ap325rxa_defconfig	modified	+26	−9	View file
arch/sh/configs/dreamcast_defconfig	modified	+212	−92	View file
arch/sh/configs/hp6xx_defconfig	modified	+174	−84	View file
arch/sh/configs/landisk_defconfig	modified	+394	−500	View file
arch/sh/configs/lboxre2_defconfig	modified	+318	−407	View file
arch/sh/configs/magicpanelr2_defconfig	modified	+116	−79	View file
arch/sh/configs/microdev_defconfig	modified	+286	−344	View file
arch/sh/configs/migor_defconfig	modified	+51	−12	View file
arch/sh/configs/r7780mp_defconfig	modified	+124	−70	View file
arch/sh/configs/r7785rp_defconfig	modified	+172	−86	View file
arch/sh/configs/rsk7203_defconfig	modified	+142	−37	View file
arch/sh/configs/rts7751r2d1_defconfig	modified	+153	−106	View file
arch/sh/configs/rts7751r2dplus_defconfig	modified	+153	−106	View file
arch/sh/configs/sdk7780_defconfig	modified	+172	−97	View file
arch/sh/configs/se7206_defconfig	modified	+28	−10	View file
arch/sh/configs/se7343_defconfig	modified	+33	−45	View file
arch/sh/configs/se7619_defconfig	modified	+106	−155	View file
arch/sh/drivers/dma/dma-g2.c	modified	+2	−2	View file
arch/sh/drivers/dma/dma-pvr2.c	modified	+2	−2	View file
arch/sh/drivers/dma/dma-sh.c	modified	+1	−1	View file
arch/sh/drivers/dma/dma-sh.h	modified	+1	−1	View file
arch/sh/drivers/pci/fixups-dreamcast.c	modified	+1	−1	View file
arch/sh/drivers/pci/ops-cayman.c	modified	+1	−1	View file
arch/sh/drivers/pci/ops-dreamcast.c	modified	+1	−1	View file
arch/sh/drivers/pci/ops-se7780.c	modified	+1	−1	View file
arch/sh/drivers/pci/pci-sh5.c	modified	+1	−1	View file
include/asm-sh/.gitignore → arch/sh/include/asm/.gitignore	renamed	+0	−2	View file
include/asm-sh/Kbuild → arch/sh/include/asm/Kbuild	renamed	+0	−0	View file
include/asm-sh/a.out.h → arch/sh/include/asm/a.out.h	renamed	+0	−0	View file
include/asm-sh/adc.h → arch/sh/include/asm/adc.h	renamed	+1	−1	View file
include/asm-sh/addrspace.h → arch/sh/include/asm/addrspace.h	renamed	+1	−1	View file
include/asm-sh/atomic-grb.h → arch/sh/include/asm/atomic-grb.h	renamed	+0	−0	View file
include/asm-sh/atomic-irq.h → arch/sh/include/asm/atomic-irq.h	renamed	+0	−0	View file
include/asm-sh/atomic-llsc.h → arch/sh/include/asm/atomic-llsc.h	renamed	+0	−0	View file
include/asm-sh/atomic.h → arch/sh/include/asm/atomic.h	renamed	+0	−0	View file
include/asm-sh/auxvec.h → arch/sh/include/asm/auxvec.h	renamed	+1	−1	View file
include/asm-sh/bitops-grb.h → arch/sh/include/asm/bitops-grb.h	renamed	+0	−0	View file
include/asm-sh/bitops-irq.h → arch/sh/include/asm/bitops-irq.h	renamed	+0	−0	View file
include/asm-sh/bitops.h → arch/sh/include/asm/bitops.h	renamed	+0	−0	View file
include/asm-sh/bug.h → arch/sh/include/asm/bug.h	renamed	+0	−0	View file
include/asm-sh/bugs.h → arch/sh/include/asm/bugs.h	renamed	+0	−0	View file
include/asm-sh/byteorder.h → arch/sh/include/asm/byteorder.h	renamed	+0	−0	View file
include/asm-sh/cache.h → arch/sh/include/asm/cache.h	renamed	+1	−1	View file
include/asm-sh/cacheflush.h → arch/sh/include/asm/cacheflush.h	renamed	+1	−1	View file
include/asm-sh/checksum.h → arch/sh/include/asm/checksum.h	renamed	+0	−0	View file
include/asm-sh/checksum_32.h → arch/sh/include/asm/checksum_32.h	renamed	+0	−0	View file
include/asm-sh/checksum_64.h → arch/sh/include/asm/checksum_64.h	renamed	+0	−0	View file
include/asm-sh/clock.h → arch/sh/include/asm/clock.h	renamed	+0	−0	View file
include/asm-sh/cmpxchg-grb.h → arch/sh/include/asm/cmpxchg-grb.h	renamed	+0	−0	View file
include/asm-sh/cmpxchg-irq.h → arch/sh/include/asm/cmpxchg-irq.h	renamed	+0	−0	View file
include/asm-sh/cpu-features.h → arch/sh/include/asm/cpu-features.h	renamed	+0	−0	View file
include/asm-sh/cputime.h → arch/sh/include/asm/cputime.h	renamed	+0	−0	View file
include/asm-sh/current.h → arch/sh/include/asm/current.h	renamed	+0	−0	View file
include/asm-sh/delay.h → arch/sh/include/asm/delay.h	renamed	+0	−0	View file
include/asm-sh/device.h → arch/sh/include/asm/device.h	renamed	+0	−0	View file
include/asm-sh/div64.h → arch/sh/include/asm/div64.h	renamed	+0	−0	View file
include/asm-sh/dma-mapping.h → arch/sh/include/asm/dma-mapping.h	renamed	+0	−0	View file
include/asm-sh/dma.h → arch/sh/include/asm/dma.h	renamed	+1	−1	View file
include/asm-sh/dmabrg.h → arch/sh/include/asm/dmabrg.h	renamed	+0	−0	View file
include/asm-sh/edosk7705.h → arch/sh/include/asm/edosk7705.h	renamed	+0	−0	View file
include/asm-sh/elf.h → arch/sh/include/asm/elf.h	renamed	+0	−0	View file
include/asm-sh/emergency-restart.h → arch/sh/include/asm/emergency-restart.h	renamed	+0	−0	View file
include/asm-sh/entry-macros.S → arch/sh/include/asm/entry-macros.S	renamed	+0	−0	View file
include/asm-sh/errno.h → arch/sh/include/asm/errno.h	renamed	+0	−0	View file
include/asm-sh/fb.h → arch/sh/include/asm/fb.h	renamed	+0	−0	View file
include/asm-sh/fcntl.h → arch/sh/include/asm/fcntl.h	renamed	+0	−0	View file
include/asm-sh/fixmap.h → arch/sh/include/asm/fixmap.h	renamed	+0	−0	View file
include/asm-sh/flat.h → arch/sh/include/asm/flat.h	renamed	+0	−0	View file
include/asm-sh/fpu.h → arch/sh/include/asm/fpu.h	renamed	+0	−0	View file
include/asm-sh/freq.h → arch/sh/include/asm/freq.h	renamed	+1	−1	View file
include/asm-sh/futex-irq.h → arch/sh/include/asm/futex-irq.h	renamed	+0	−0	View file
include/asm-sh/futex.h → arch/sh/include/asm/futex.h	renamed	+0	−0	View file
include/asm-sh/gpio.h → arch/sh/include/asm/gpio.h	renamed	+1	−1	View file
include/asm-sh/hardirq.h → arch/sh/include/asm/hardirq.h	renamed	+0	−0	View file
include/asm-sh/hd64461.h → arch/sh/include/asm/hd64461.h	renamed	+0	−0	View file
include/asm-sh/hd64465/gpio.h → arch/sh/include/asm/hd64465/gpio.h	renamed	+0	−0	View file
include/asm-sh/hd64465/hd64465.h → arch/sh/include/asm/hd64465/hd64465.h	renamed	+0	−0	View file
include/asm-sh/hd64465/io.h → arch/sh/include/asm/hd64465/io.h	renamed	+0	−0	View file
include/asm-sh/heartbeat.h → arch/sh/include/asm/heartbeat.h	renamed	+0	−0	View file
include/asm-sh/hp6xx.h → arch/sh/include/asm/hp6xx.h	renamed	+0	−0	View file
include/asm-sh/hugetlb.h → arch/sh/include/asm/hugetlb.h	renamed	+0	−0	View file
include/asm-sh/hw_irq.h → arch/sh/include/asm/hw_irq.h	renamed	+0	−0	View file
include/asm-sh/i2c-sh7760.h → arch/sh/include/asm/i2c-sh7760.h	renamed	+0	−0	View file
include/asm-sh/ilsel.h → arch/sh/include/asm/ilsel.h	renamed	+0	−0	View file
include/asm-sh/io.h → arch/sh/include/asm/io.h	renamed	+0	−0	View file
include/asm-sh/io_generic.h → arch/sh/include/asm/io_generic.h	renamed	+0	−0	View file
include/asm-sh/io_trapped.h → arch/sh/include/asm/io_trapped.h	renamed	+0	−0	View file
include/asm-sh/ioctl.h → arch/sh/include/asm/ioctl.h	renamed	+0	−0	View file
include/asm-sh/ioctls.h → arch/sh/include/asm/ioctls.h	renamed	+0	−0	View file
include/asm-sh/ipcbuf.h → arch/sh/include/asm/ipcbuf.h	renamed	+0	−0	View file
include/asm-sh/irq.h → arch/sh/include/asm/irq.h	renamed	+1	−1	View file
include/asm-sh/irq_regs.h → arch/sh/include/asm/irq_regs.h	renamed	+0	−0	View file
include/asm-sh/irqflags.h → arch/sh/include/asm/irqflags.h	renamed	+0	−0	View file
include/asm-sh/irqflags_32.h → arch/sh/include/asm/irqflags_32.h	renamed	+0	−0	View file
include/asm-sh/irqflags_64.h → arch/sh/include/asm/irqflags_64.h	renamed	+1	−1	View file
include/asm-sh/kdebug.h → arch/sh/include/asm/kdebug.h	renamed	+0	−0	View file
include/asm-sh/kexec.h → arch/sh/include/asm/kexec.h	renamed	+0	−0	View file
include/asm-sh/kgdb.h → arch/sh/include/asm/kgdb.h	renamed	+0	−0	View file
include/asm-sh/kmap_types.h → arch/sh/include/asm/kmap_types.h	renamed	+0	−0	View file
include/asm-sh/lboxre2.h → arch/sh/include/asm/lboxre2.h	renamed	+0	−0	View file
include/asm-sh/linkage.h → arch/sh/include/asm/linkage.h	renamed	+0	−0	View file
include/asm-sh/local.h → arch/sh/include/asm/local.h	renamed	+0	−0	View file
include/asm-sh/machvec.h → arch/sh/include/asm/machvec.h	renamed	+0	−0	View file
include/asm-sh/magicpanelr2.h → arch/sh/include/asm/magicpanelr2.h	renamed	+0	−0	View file
include/asm-sh/mc146818rtc.h → arch/sh/include/asm/mc146818rtc.h	renamed	+0	−0	View file
include/asm-sh/microdev.h → arch/sh/include/asm/microdev.h	renamed	+0	−0	View file
include/asm-sh/migor.h → arch/sh/include/asm/migor.h	renamed	+0	−0	View file
include/asm-sh/mman.h → arch/sh/include/asm/mman.h	renamed	+0	−0	View file
include/asm-sh/mmu.h → arch/sh/include/asm/mmu.h	renamed	+0	−0	View file
include/asm-sh/mmu_context.h → arch/sh/include/asm/mmu_context.h	renamed	+1	−1	View file
include/asm-sh/mmu_context_32.h → arch/sh/include/asm/mmu_context_32.h	renamed	+0	−0	View file
include/asm-sh/mmu_context_64.h → arch/sh/include/asm/mmu_context_64.h	renamed	+1	−1	View file
include/asm-sh/mmzone.h → arch/sh/include/asm/mmzone.h	renamed	+0	−0	View file
include/asm-sh/module.h → arch/sh/include/asm/module.h	renamed	+0	−0	View file
include/asm-sh/msgbuf.h → arch/sh/include/asm/msgbuf.h	renamed	+0	−0	View file
include/asm-sh/mutex.h → arch/sh/include/asm/mutex.h	renamed	+0	−0	View file
include/asm-sh/page.h → arch/sh/include/asm/page.h	renamed	+0	−0	View file
include/asm-sh/param.h → arch/sh/include/asm/param.h	renamed	+0	−0	View file
include/asm-sh/parport.h → arch/sh/include/asm/parport.h	renamed	+0	−0	View file
include/asm-sh/pci.h → arch/sh/include/asm/pci.h	renamed	+0	−0	View file
include/asm-sh/percpu.h → arch/sh/include/asm/percpu.h	renamed	+0	−0	View file
include/asm-sh/pgalloc.h → arch/sh/include/asm/pgalloc.h	renamed	+0	−0	View file
include/asm-sh/pgtable.h → arch/sh/include/asm/pgtable.h	renamed	+0	−0	View file
include/asm-sh/pgtable_32.h → arch/sh/include/asm/pgtable_32.h	renamed	+0	−0	View file
include/asm-sh/pgtable_64.h → arch/sh/include/asm/pgtable_64.h	renamed	+0	−0	View file
include/asm-sh/pm.h → arch/sh/include/asm/pm.h	renamed	+0	−0	View file
include/asm-sh/poll.h → arch/sh/include/asm/poll.h	renamed	+0	−0	View file
include/asm-sh/posix_types.h → arch/sh/include/asm/posix_types.h	renamed	+0	−0	View file
include/asm-sh/posix_types_32.h → arch/sh/include/asm/posix_types_32.h	renamed	+0	−0	View file
include/asm-sh/posix_types_64.h → arch/sh/include/asm/posix_types_64.h	renamed	+0	−0	View file
include/asm-sh/processor.h → arch/sh/include/asm/processor.h	renamed	+0	−0	View file
include/asm-sh/processor_32.h → arch/sh/include/asm/processor_32.h	renamed	+1	−1	View file
include/asm-sh/processor_64.h → arch/sh/include/asm/processor_64.h	renamed	+1	−1	View file
include/asm-sh/ptrace.h → arch/sh/include/asm/ptrace.h	renamed	+0	−0	View file
include/asm-sh/push-switch.h → arch/sh/include/asm/push-switch.h	renamed	+0	−0	View file
include/asm-sh/r7780rp.h → arch/sh/include/asm/r7780rp.h	renamed	+0	−0	View file
include/asm-sh/resource.h → arch/sh/include/asm/resource.h	renamed	+0	−0	View file
include/asm-sh/rtc.h → arch/sh/include/asm/rtc.h	renamed	+1	−1	View file
include/asm-sh/rts7751r2d.h → arch/sh/include/asm/rts7751r2d.h	renamed	+0	−0	View file
include/asm-sh/rwsem.h → arch/sh/include/asm/rwsem.h	renamed	+0	−0	View file
include/asm-sh/scatterlist.h → arch/sh/include/asm/scatterlist.h	renamed	+0	−0	View file
include/asm-sh/sdk7780.h → arch/sh/include/asm/sdk7780.h	renamed	+0	−0	View file
include/asm-sh/sections.h → arch/sh/include/asm/sections.h	renamed	+0	−0	View file
include/asm-sh/segment.h → arch/sh/include/asm/segment.h	renamed	+0	−0	View file
include/asm-sh/sembuf.h → arch/sh/include/asm/sembuf.h	renamed	+0	−0	View file
include/asm-sh/serial.h → arch/sh/include/asm/serial.h	renamed	+1	−1	View file
include/asm-sh/setup.h → arch/sh/include/asm/setup.h	renamed	+0	−0	View file
include/asm-sh/sfp-machine.h → arch/sh/include/asm/sfp-machine.h	renamed	+0	−0	View file
include/asm-sh/sh7760fb.h → arch/sh/include/asm/sh7760fb.h	renamed	+0	−0	View file
include/asm-sh/sh7763rdp.h → arch/sh/include/asm/sh7763rdp.h	renamed	+0	−0	View file
include/asm-sh/sh7785lcr.h → arch/sh/include/asm/sh7785lcr.h	renamed	+0	−0	View file
include/asm-sh/sh_bios.h → arch/sh/include/asm/sh_bios.h	renamed	+0	−0	View file
include/asm-sh/sh_keysc.h → arch/sh/include/asm/sh_keysc.h	renamed	+0	−0	View file
include/asm-sh/sh_mobile_lcdc.h → arch/sh/include/asm/sh_mobile_lcdc.h	renamed	+0	−0	View file
include/asm-sh/shmbuf.h → arch/sh/include/asm/shmbuf.h	renamed	+0	−0	View file
include/asm-sh/shmin.h → arch/sh/include/asm/shmin.h	renamed	+0	−0	View file
include/asm-sh/shmparam.h → arch/sh/include/asm/shmparam.h	renamed	+0	−0	View file
include/asm-sh/sigcontext.h → arch/sh/include/asm/sigcontext.h	renamed	+0	−0	View file
include/asm-sh/siginfo.h → arch/sh/include/asm/siginfo.h	renamed	+0	−0	View file
include/asm-sh/signal.h → arch/sh/include/asm/signal.h	renamed	+0	−0	View file
include/asm-sh/smc37c93x.h → arch/sh/include/asm/smc37c93x.h	renamed	+0	−0	View file
include/asm-sh/smp.h → arch/sh/include/asm/smp.h	renamed	+0	−0	View file
include/asm-sh/snapgear.h → arch/sh/include/asm/snapgear.h	renamed	+0	−0	View file
include/asm-sh/socket.h → arch/sh/include/asm/socket.h	renamed	+0	−0	View file
include/asm-sh/sockios.h → arch/sh/include/asm/sockios.h	renamed	+0	−0	View file
include/asm-sh/sparsemem.h → arch/sh/include/asm/sparsemem.h	renamed	+0	−0	View file
include/asm-sh/spi.h → arch/sh/include/asm/spi.h	renamed	+0	−0	View file
include/asm-sh/spinlock.h → arch/sh/include/asm/spinlock.h	renamed	+0	−0	View file
include/asm-sh/spinlock_types.h → arch/sh/include/asm/spinlock_types.h	renamed	+0	−0	View file
include/asm-sh/stat.h → arch/sh/include/asm/stat.h	renamed	+0	−0	View file
include/asm-sh/statfs.h → arch/sh/include/asm/statfs.h	renamed	+0	−0	View file
include/asm-sh/string.h → arch/sh/include/asm/string.h	renamed	+0	−0	View file
include/asm-sh/string_32.h → arch/sh/include/asm/string_32.h	renamed	+0	−0	View file
include/asm-sh/string_64.h → arch/sh/include/asm/string_64.h	renamed	+0	−0	View file
include/asm-sh/system.h → arch/sh/include/asm/system.h	renamed	+0	−0	View file
include/asm-sh/system_32.h → arch/sh/include/asm/system_32.h	renamed	+0	−0	View file
include/asm-sh/system_64.h → arch/sh/include/asm/system_64.h	renamed	+0	−0	View file
include/asm-sh/systemh7751.h → arch/sh/include/asm/systemh7751.h	renamed	+0	−0	View file
include/asm-sh/termbits.h → arch/sh/include/asm/termbits.h	renamed	+0	−0	View file
include/asm-sh/termios.h → arch/sh/include/asm/termios.h	renamed	+0	−0	View file
include/asm-sh/thread_info.h → arch/sh/include/asm/thread_info.h	renamed	+0	−0	View file
include/asm-sh/timer.h → arch/sh/include/asm/timer.h	renamed	+1	−1	View file
include/asm-sh/timex.h → arch/sh/include/asm/timex.h	renamed	+0	−0	View file
include/asm-sh/titan.h → arch/sh/include/asm/titan.h	renamed	+0	−0	View file
include/asm-sh/tlb.h → arch/sh/include/asm/tlb.h	renamed	+0	−0	View file
include/asm-sh/tlb_64.h → arch/sh/include/asm/tlb_64.h	renamed	+0	−0	View file
include/asm-sh/tlbflush.h → arch/sh/include/asm/tlbflush.h	renamed	+0	−0	View file
include/asm-sh/topology.h → arch/sh/include/asm/topology.h	renamed	+0	−0	View file
include/asm-sh/types.h → arch/sh/include/asm/types.h	renamed	+0	−0	View file
include/asm-sh/uaccess.h → arch/sh/include/asm/uaccess.h	renamed	+4	−2	View file
include/asm-sh/uaccess_32.h → arch/sh/include/asm/uaccess_32.h	renamed	+1	−2	View file
include/asm-sh/uaccess_64.h → arch/sh/include/asm/uaccess_64.h	renamed	+0	−0	View file
include/asm-sh/ubc.h → arch/sh/include/asm/ubc.h	renamed	+1	−1	View file
include/asm-sh/ucontext.h → arch/sh/include/asm/ucontext.h	renamed	+0	−0	View file
include/asm-sh/unaligned.h → arch/sh/include/asm/unaligned.h	renamed	+0	−0	View file
include/asm-sh/unistd.h → arch/sh/include/asm/unistd.h	renamed	+0	−0	View file
include/asm-sh/unistd_32.h → arch/sh/include/asm/unistd_32.h	renamed	+0	−0	View file
include/asm-sh/unistd_64.h → arch/sh/include/asm/unistd_64.h	renamed	+0	−0	View file
include/asm-sh/user.h → arch/sh/include/asm/user.h	renamed	+0	−0	View file
include/asm-sh/vga.h → arch/sh/include/asm/vga.h	renamed	+0	−0	View file
include/asm-sh/watchdog.h → arch/sh/include/asm/watchdog.h	renamed	+2	−2	View file
include/asm-sh/xor.h → arch/sh/include/asm/xor.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh2/addrspace.h → arch/sh/include/cpu-common/cpu/addrspace.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh2/cacheflush.h → arch/sh/include/cpu-common/cpu/cacheflush.h	renamed	+2	−2	View file
include/asm-sh/cpu-sh2/mmu_context.h → arch/sh/include/cpu-common/cpu/mmu_context.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh2/rtc.h → arch/sh/include/cpu-common/cpu/rtc.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh2/sigcontext.h → arch/sh/include/cpu-common/cpu/sigcontext.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh2/timer.h → arch/sh/include/cpu-common/cpu/timer.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh2/cache.h → arch/sh/include/cpu-sh2/cpu/cache.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh2/dma.h → arch/sh/include/cpu-sh2/cpu/dma.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh2/freq.h → arch/sh/include/cpu-sh2/cpu/freq.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh2/ubc.h → arch/sh/include/cpu-sh2/cpu/ubc.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh2/watchdog.h → arch/sh/include/cpu-sh2/cpu/watchdog.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh2a/cache.h → arch/sh/include/cpu-sh2a/cpu/cache.h	renamed	+0	−0	View file
arch/sh/include/cpu-sh2a/cpu/dma.h	added	+1	−0	View file
include/asm-sh/cpu-sh2a/freq.h → arch/sh/include/cpu-sh2a/cpu/freq.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh2a/rtc.h → arch/sh/include/cpu-sh2a/cpu/rtc.h	renamed	+0	−0	View file
arch/sh/include/cpu-sh2a/cpu/ubc.h	added	+1	−0	View file
arch/sh/include/cpu-sh2a/cpu/watchdog.h	added	+1	−0	View file
include/asm-sh/cpu-sh3/adc.h → arch/sh/include/cpu-sh3/cpu/adc.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh3/cache.h → arch/sh/include/cpu-sh3/cpu/cache.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh3/cacheflush.h → arch/sh/include/cpu-sh3/cpu/cacheflush.h	renamed	+1	−35	View file
include/asm-sh/cpu-sh3/dac.h → arch/sh/include/cpu-sh3/cpu/dac.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh3/dma.h → arch/sh/include/cpu-sh3/cpu/dma.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh3/freq.h → arch/sh/include/cpu-sh3/cpu/freq.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh3/gpio.h → arch/sh/include/cpu-sh3/cpu/gpio.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh3/mmu_context.h → arch/sh/include/cpu-sh3/cpu/mmu_context.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh3/timer.h → arch/sh/include/cpu-sh3/cpu/timer.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh3/ubc.h → arch/sh/include/cpu-sh3/cpu/ubc.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh3/watchdog.h → arch/sh/include/cpu-sh3/cpu/watchdog.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh4/addrspace.h → arch/sh/include/cpu-sh4/cpu/addrspace.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh4/cache.h → arch/sh/include/cpu-sh4/cpu/cache.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh4/cacheflush.h → arch/sh/include/cpu-sh4/cpu/cacheflush.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh4/dma-sh7780.h → arch/sh/include/cpu-sh4/cpu/dma-sh7780.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh4/dma.h → arch/sh/include/cpu-sh4/cpu/dma.h	renamed	+1	−1	View file
include/asm-sh/cpu-sh4/fpu.h → arch/sh/include/cpu-sh4/cpu/fpu.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh4/freq.h → arch/sh/include/cpu-sh4/cpu/freq.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh4/mmu_context.h → arch/sh/include/cpu-sh4/cpu/mmu_context.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh4/rtc.h → arch/sh/include/cpu-sh4/cpu/rtc.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh4/sigcontext.h → arch/sh/include/cpu-sh4/cpu/sigcontext.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh4/sq.h → arch/sh/include/cpu-sh4/cpu/sq.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh4/timer.h → arch/sh/include/cpu-sh4/cpu/timer.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh4/ubc.h → arch/sh/include/cpu-sh4/cpu/ubc.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh4/watchdog.h → arch/sh/include/cpu-sh4/cpu/watchdog.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh5/addrspace.h → arch/sh/include/cpu-sh5/cpu/addrspace.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh5/cache.h → arch/sh/include/cpu-sh5/cpu/cache.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh5/cacheflush.h → arch/sh/include/cpu-sh5/cpu/cacheflush.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh5/dma.h → arch/sh/include/cpu-sh5/cpu/dma.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh5/irq.h → arch/sh/include/cpu-sh5/cpu/irq.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh5/mmu_context.h → arch/sh/include/cpu-sh5/cpu/mmu_context.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh5/registers.h → arch/sh/include/cpu-sh5/cpu/registers.h	renamed	+0	−0	View file
include/asm-sh/cpu-sh5/rtc.h → arch/sh/include/cpu-sh5/cpu/rtc.h	renamed	+0	−0	View file
include/asm-sh/dreamcast/dma.h → arch/sh/include/mach-dreamcast/mach/dma.h	renamed	+0	−0	View file
include/asm-sh/dreamcast/maple.h → arch/sh/include/mach-dreamcast/mach/maple.h	renamed	+0	−0	View file
include/asm-sh/dreamcast/pci.h → arch/sh/include/mach-dreamcast/mach/pci.h	renamed	+1	−1	View file
include/asm-sh/dreamcast/sysasic.h → arch/sh/include/mach-dreamcast/mach/sysasic.h	renamed	+0	−0	View file
include/asm-sh/landisk/gio.h → arch/sh/include/mach-landisk/mach/gio.h	renamed	+0	−0	View file
include/asm-sh/landisk/iodata_landisk.h → arch/sh/include/mach-landisk/mach/iodata_landisk.h	renamed	+0	−0	View file
include/asm-sh/se.h → arch/sh/include/mach-se/mach/se.h	renamed	+0	−0	View file
include/asm-sh/se7206.h → arch/sh/include/mach-se/mach/se7206.h	renamed	+0	−0	View file
include/asm-sh/se7343.h → arch/sh/include/mach-se/mach/se7343.h	renamed	+0	−0	View file
include/asm-sh/se7721.h → arch/sh/include/mach-se/mach/se7721.h	renamed	+0	−0	View file
include/asm-sh/se7722.h → arch/sh/include/mach-se/mach/se7722.h	renamed	+0	−0	View file
include/asm-sh/se7751.h → arch/sh/include/mach-se/mach/se7751.h	renamed	+0	−0	View file
include/asm-sh/se7780.h → arch/sh/include/mach-se/mach/se7780.h	renamed	+0	−0	View file
include/asm-sh/sh03/io.h → arch/sh/include/mach-sh03/mach/io.h	renamed	+0	−0	View file
include/asm-sh/sh03/sh03.h → arch/sh/include/mach-sh03/mach/sh03.h	renamed	+0	−0	View file
arch/sh/kernel/.gitignore	added	+1	−0	View file
arch/sh/kernel/cf-enabler.c	modified	+3	−3	View file
arch/sh/kernel/cpu/irq/intc-sh5.c	modified	+1	−1	View file
arch/sh/kernel/cpu/sh2/entry.S	modified	+1	−1	View file
arch/sh/kernel/cpu/sh2a/entry.S	modified	+1	−1	View file
arch/sh/kernel/cpu/sh3/entry.S	modified	+1	−1	View file
arch/sh/kernel/cpu/sh4/fpu.c	modified	+1	−1	View file
arch/sh/kernel/cpu/sh4/softfloat.c	modified	+1	−1	View file
arch/sh/kernel/cpu/sh4/sq.c	modified	+1	−1	View file
arch/sh/kernel/cpu/sh5/entry.S	modified	+1	−1	View file
arch/sh/kernel/head_64.S	modified	+2	−2	View file
arch/sh/kernel/irq.c	modified	+1	−1	View file
arch/sh/kernel/time_64.c	modified	+2	−2	View file
arch/sh/lib64/panic.c	modified	+1	−1	View file
arch/sh/mm/fault_64.c	modified	+1	−1	View file
arch/sh/tools/Makefile	modified	+2	−2	View file
drivers/cdrom/gdrom.c	modified	+2	−2	View file
drivers/input/keyboard/maple_keyb.c	modified	+0	−1	View file
drivers/serial/sh-sci.h	modified	+7	−5	View file
drivers/sh/maple/maple.c	modified	+184	−81	View file
drivers/video/Makefile	modified	+0	−1	View file
drivers/video/backlight/hp680_bl.c	modified	+1	−1	View file
drivers/video/hitfb.c	modified	+1	−1	View file
drivers/video/pvr2fb.c	modified	+3	−3	View file
include/asm-sh/cpu-sh2a/addrspace.h	deleted	+0	−10	View before deletion
include/asm-sh/cpu-sh2a/cacheflush.h	deleted	+0	−1	View before deletion
include/asm-sh/cpu-sh2a/dma.h	deleted	+0	−1	View before deletion
include/asm-sh/cpu-sh2a/mmu_context.h	deleted	+0	−1	View before deletion
include/asm-sh/cpu-sh2a/timer.h	deleted	+0	−1	View before deletion
include/asm-sh/cpu-sh2a/ubc.h	deleted	+0	−1	View before deletion
include/asm-sh/cpu-sh2a/watchdog.h	deleted	+0	−1	View before deletion
include/asm-sh/cpu-sh3/addrspace.h	deleted	+0	−19	View before deletion
include/asm-sh/cpu-sh3/rtc.h	deleted	+0	−8	View before deletion
include/asm-sh/cpu-sh3/sigcontext.h	deleted	+0	−17	View before deletion
include/asm-sh/cpu-sh5/timer.h	deleted	+0	−4	View before deletion
include/linux/maple.h	modified	+5	−1	View file
mm/hugetlb.c	modified	+1	−1	View file
sound/sh/aica.c	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index deedc0d..5f043d1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3968,7 +3968,7 @@ M:	[email protected]
 L:	[email protected]
 W:	http://www.linux-sh.org
 T:	git kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git
-S:	Maintained
+S:	Supported
 
 SUN3/3X
 P:	Sam Creasey

arch/sh/Kconfig

View file

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 0b88dc4..cb992c3 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -24,6 +24,11 @@ config SUPERH32
 config SUPERH64
 	def_bool y if CPU_SH5
 
+config ARCH_DEFCONFIG
+	string
+	default "arch/sh/configs/shx3_defconfig" if SUPERH32
+	default "arch/sh/configs/cayman_defconfig" if SUPERH64
+
 config RWSEM_GENERIC_SPINLOCK
 	def_bool y
 
@@ -348,253 +353,10 @@ config CPU_SUBTYPE_SH5_103
 endchoice
 
 source "arch/sh/mm/Kconfig"
+ 
 source "arch/sh/Kconfig.cpu"
 
-menu "Board support"
-
-config SOLUTION_ENGINE
-	bool
-
-config SH_SOLUTION_ENGINE
-	bool "SolutionEngine"
-	select SOLUTION_ENGINE
-	select CPU_HAS_IPR_IRQ
-	depends on CPU_SUBTYPE_SH7705 || CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7710 || \
-	  CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7750S || \
-	  CPU_SUBTYPE_SH7750R 
-	help
-	  Select SolutionEngine if configuring for a Hitachi SH7705, SH7709,
-	  SH7710, SH7712, SH7750, SH7750S or SH7750R evaluation board.
-
-config SH_7206_SOLUTION_ENGINE
-	bool "SolutionEngine7206"
-	select SOLUTION_ENGINE
-	depends on CPU_SUBTYPE_SH7206
-	help
-	  Select 7206 SolutionEngine if configuring for a Hitachi SH7206
-	  evaluation board.
-
-config SH_7619_SOLUTION_ENGINE
-	bool "SolutionEngine7619"
-	select SOLUTION_ENGINE
-	depends on CPU_SUBTYPE_SH7619
-	help
-	  Select 7619 SolutionEngine if configuring for a Hitachi SH7619
-	  evaluation board.
-	
-config SH_7721_SOLUTION_ENGINE
-	bool "SolutionEngine7721"
-	select SOLUTION_ENGINE
-	depends on CPU_SUBTYPE_SH7721
-	help
-	  Select 7721 SolutionEngine if configuring for a Hitachi SH7721
-	  evaluation board.
-
-config SH_7722_SOLUTION_ENGINE
-	bool "SolutionEngine7722"
-	select SOLUTION_ENGINE
-	depends on CPU_SUBTYPE_SH7722
-	help
-	  Select 7722 SolutionEngine if configuring for a Hitachi SH772
-	  evaluation board.
-
-config SH_7751_SOLUTION_ENGINE
-	bool "SolutionEngine7751"
-	select SOLUTION_ENGINE
-	select CPU_HAS_IPR_IRQ
-	depends on CPU_SUBTYPE_SH7751
-	help
-	  Select 7751 SolutionEngine if configuring for a Hitachi SH7751
-	  evaluation board.
-	  
-config SH_7780_SOLUTION_ENGINE
-	bool "SolutionEngine7780"
-	select SOLUTION_ENGINE
-	select SYS_SUPPORTS_PCI
-	depends on CPU_SUBTYPE_SH7780
-	help
-	  Select 7780 SolutionEngine if configuring for a Renesas SH7780
-	  evaluation board.
-
-config SH_7343_SOLUTION_ENGINE
-	bool "SolutionEngine7343"
-	select SOLUTION_ENGINE
-	depends on CPU_SUBTYPE_SH7343
-	help
-	  Select 7343 SolutionEngine if configuring for a Hitachi
-	  SH7343 (SH-Mobile 3AS) evaluation board.
-
-config SH_7751_SYSTEMH
-	bool "SystemH7751R"
-	depends on CPU_SUBTYPE_SH7751R
-	help
-	  Select SystemH if you are configuring for a Renesas SystemH
-	  7751R evaluation board.
-
-config SH_HP6XX
-	bool "HP6XX"
-	select SYS_SUPPORTS_APM_EMULATION
-	select HD6446X_SERIES
-	depends on CPU_SUBTYPE_SH7709
-	help
-	  Select HP6XX if configuring for a HP jornada HP6xx.
-	  More information (hardware only) at
-	  <http://www.hp.com/jornada/>.
-
-config SH_DREAMCAST
-	bool "Dreamcast"
-	select SYS_SUPPORTS_PCI
-	depends on CPU_SUBTYPE_SH7091
-	help
-	  Select Dreamcast if configuring for a SEGA Dreamcast.
-	  More information at <http://www.linux-sh.org>
-
-config SH_SH03
-	bool "Interface CTP/PCI-SH03"
-	depends on CPU_SUBTYPE_SH7751
-	select CPU_HAS_IPR_IRQ
-	select SYS_SUPPORTS_PCI
-	help
-	  CTP/PCI-SH03 is a CPU module computer that is produced
-	  by Interface Corporation.
-	  More information at <http://www.interface.co.jp>
-
-config SH_SECUREEDGE5410
-	bool "SecureEdge5410"
-	depends on CPU_SUBTYPE_SH7751R
-	select CPU_HAS_IPR_IRQ
-	select SYS_SUPPORTS_PCI
-	help
-	  Select SecureEdge5410 if configuring for a SnapGear SH board.
-	  This includes both the OEM SecureEdge products as well as the
-	  SME product line.
-
-config SH_RTS7751R2D
-	bool "RTS7751R2D"
-	depends on CPU_SUBTYPE_SH7751R
-	select SYS_SUPPORTS_PCI
-	select IO_TRAPPED
-	help
-	  Select RTS7751R2D if configuring for a Renesas Technology
-	  Sales SH-Graphics board.
-
-config SH_RSK7203
-	bool "RSK7203"
-	depends on CPU_SUBTYPE_SH7203
-
-config SH_SDK7780
-	bool "SDK7780R3"
-	depends on CPU_SUBTYPE_SH7780
-	select SYS_SUPPORTS_PCI
-	help
-	  Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3
-	  evaluation board.
-
-config SH_HIGHLANDER
-	bool "Highlander"
-	depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
-	select SYS_SUPPORTS_PCI
-	select IO_TRAPPED
-
-config SH_SH7785LCR
-	bool "SH7785LCR"
-	depends on CPU_SUBTYPE_SH7785
-	select SYS_SUPPORTS_PCI
-	select IO_TRAPPED
-
-config SH_SH7785LCR_29BIT_PHYSMAPS
-	bool "SH7785LCR 29bit physmaps"
-	depends on SH_SH7785LCR
-	default y
-	help
-	  This board has 2 physical memory maps. It can be changed with
-	  DIP switch(S2-5). If you set the DIP switch for S2-5 = ON,
-	  you can access all on-board device in 29bit address mode.
-
-config SH_MIGOR
-	bool "Migo-R"
-	depends on CPU_SUBTYPE_SH7722
-	help
-	  Select Migo-R if configuring for the SH7722 Migo-R platform
-          by Renesas System Solutions Asia Pte. Ltd.
-
-config SH_AP325RXA
-	bool "AP-325RXA"
-	depends on CPU_SUBTYPE_SH7723
-	help
-	  Renesas "AP-325RXA" support.
-	  Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"
-
-config SH_SH7763RDP
-	bool "SH7763RDP"
-	depends on CPU_SUBTYPE_SH7763
-	help
-	  Select SH7763RDP if configuring for a Renesas SH7763
-	  evaluation board.
-
-config SH_EDOSK7705
-	bool "EDOSK7705"
-	depends on CPU_SUBTYPE_SH7705
-
-config SH_SH4202_MICRODEV
-	bool "SH4-202 MicroDev"
-	depends on CPU_SUBTYPE_SH4_202
-	help
-	  Select SH4-202 MicroDev if configuring for a SuperH MicroDev board
-	  with an SH4-202 CPU.
-
-config SH_LANDISK
-	bool "LANDISK"
-	depends on CPU_SUBTYPE_SH7751R
-	select SYS_SUPPORTS_PCI
-	help
-	  I-O DATA DEVICE, INC. "LANDISK Series" support.
-
-config SH_TITAN
-	bool "TITAN"
-	depends on CPU_SUBTYPE_SH7751R
-	select CPU_HAS_IPR_IRQ
-	select SYS_SUPPORTS_PCI
-	help
-	  Select Titan if you are configuring for a Nimble Microsystems
-	  NetEngine NP51R.
-
-config SH_SHMIN
-	bool "SHMIN"
-	depends on CPU_SUBTYPE_SH7706
-	select CPU_HAS_IPR_IRQ
-	help
-	  Select SHMIN if configuring for the SHMIN board.
-
-config SH_LBOX_RE2
-	bool "L-BOX RE2"
-	depends on CPU_SUBTYPE_SH7751R
-	select SYS_SUPPORTS_PCI
-	help
-	  Select L-BOX RE2 if configuring for the NTT COMWARE L-BOX RE2.
-
-config SH_X3PROTO
-	bool "SH-X3 Prototype board"
-	depends on CPU_SUBTYPE_SHX3
-
-config SH_MAGIC_PANEL_R2
-	bool "Magic Panel R2"
-	depends on CPU_SUBTYPE_SH7720
-	help
-	  Select Magic Panel R2 if configuring for Magic Panel R2.
-
-config SH_CAYMAN
-	bool "Hitachi Cayman"
-	depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103
-	select SYS_SUPPORTS_PCI
-
-endmenu
-
-source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
-source "arch/sh/boards/renesas/r7780rp/Kconfig"
-source "arch/sh/boards/renesas/sdk7780/Kconfig"
-source "arch/sh/boards/renesas/migor/Kconfig"
-source "arch/sh/boards/magicpanelr2/Kconfig"
+source "arch/sh/boards/Kconfig"
 
 menu "Timer and clock configuration"
 

arch/sh/Makefile

View file

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index c627e45..25659ce 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -68,7 +68,7 @@ OBJCOPYFLAGS	:= -O binary -R .note -R .note.gnu.build-id -R .comment \
 defaultimage-$(CONFIG_SUPERH32)	:= zImage
 
 # Set some sensible Kbuild defaults
-KBUILD_DEFCONFIG	:= r7780mp_defconfig
+KBUILD_DEFCONFIG	:= shx3_defconfig
 KBUILD_IMAGE		:= $(defaultimage-y)
 
 #
@@ -91,51 +91,34 @@ 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
 head-$(CONFIG_SUPERH64)	+= arch/sh/kernel/head_64.o
 
 LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 
-core-y				+= arch/sh/kernel/ arch/sh/mm/
+core-y				+= arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/
 core-$(CONFIG_SH_FPU_EMU)	+= arch/sh/math-emu/
 
-# Boards
-machdir-$(CONFIG_SH_SOLUTION_ENGINE)		+= se/770x
-machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE)	+= se/7722
-machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)	+= se/7751
-machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE)	+= se/7780
-machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE)	+= se/7343
-machdir-$(CONFIG_SH_7721_SOLUTION_ENGINE)	+= se/7721
-machdir-$(CONFIG_SH_HP6XX)			+= hp6xx
-machdir-$(CONFIG_SH_DREAMCAST)			+= dreamcast
-machdir-$(CONFIG_SH_SH03)			+= sh03
-machdir-$(CONFIG_SH_SECUREEDGE5410)		+= snapgear
-machdir-$(CONFIG_SH_RTS7751R2D)			+= renesas/rts7751r2d
-machdir-$(CONFIG_SH_7751_SYSTEMH)		+= renesas/systemh
-machdir-$(CONFIG_SH_EDOSK7705)			+= renesas/edosk7705
-machdir-$(CONFIG_SH_HIGHLANDER)			+= renesas/r7780rp
-machdir-$(CONFIG_SH_MIGOR)			+= renesas/migor
-machdir-$(CONFIG_SH_SDK7780)			+= renesas/sdk7780
-machdir-$(CONFIG_SH_X3PROTO)			+= renesas/x3proto
-machdir-$(CONFIG_SH_RSK7203)			+= renesas/rsk7203
-machdir-$(CONFIG_SH_AP325RXA)			+= renesas/ap325rxa
-machdir-$(CONFIG_SH_SH7763RDP)			+= renesas/sh7763rdp
-machdir-$(CONFIG_SH_SH7785LCR)			+= renesas/sh7785lcr
-machdir-$(CONFIG_SH_SH4202_MICRODEV)		+= superh/microdev
-machdir-$(CONFIG_SH_LANDISK)			+= landisk
-machdir-$(CONFIG_SH_TITAN)			+= titan
-machdir-$(CONFIG_SH_SHMIN)			+= shmin
-machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)	+= se/7206
-machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)	+= se/7619
-machdir-$(CONFIG_SH_LBOX_RE2)			+= lboxre2
-machdir-$(CONFIG_SH_MAGIC_PANEL_R2)		+= magicpanelr2
-machdir-$(CONFIG_SH_CAYMAN)			+= cayman
-
-incdir-y	:= $(notdir $(machdir-y))
+# Mach groups
+machdir-$(CONFIG_SOLUTION_ENGINE)		+= mach-se
+machdir-$(CONFIG_SH_HP6XX)			+= mach-hp6xx
+machdir-$(CONFIG_SH_DREAMCAST)			+= mach-dreamcast
+machdir-$(CONFIG_SH_SH03)			+= mach-sh03
+machdir-$(CONFIG_SH_SECUREEDGE5410)		+= mach-snapgear
+machdir-$(CONFIG_SH_RTS7751R2D)			+= mach-r2d
+machdir-$(CONFIG_SH_7751_SYSTEMH)		+= mach-systemh
+machdir-$(CONFIG_SH_EDOSK7705)			+= mach-edosk7705
+machdir-$(CONFIG_SH_HIGHLANDER)			+= mach-highlander
+machdir-$(CONFIG_SH_MIGOR)			+= mach-migor
+machdir-$(CONFIG_SH_SDK7780)			+= mach-sdk7780
+machdir-$(CONFIG_SH_X3PROTO)			+= mach-x3proto
+machdir-$(CONFIG_SH_SH7763RDP)			+= mach-sh7763rdp
+machdir-$(CONFIG_SH_SH4202_MICRODEV)		+= mach-microdev
+machdir-$(CONFIG_SH_LANDISK)			+= mach-landisk
+machdir-$(CONFIG_SH_TITAN)			+= mach-titan
+machdir-$(CONFIG_SH_LBOX_RE2)			+= mach-lboxre2
+machdir-$(CONFIG_SH_CAYMAN)			+= mach-cayman
 
 ifneq ($(machdir-y),)
 core-y	+= $(addprefix arch/sh/boards/, \
@@ -145,11 +128,22 @@ endif
 # Companion chips
 core-$(CONFIG_HD6446X_SERIES)	+= arch/sh/cchips/hd6446x/
 
-cpuincdir-$(CONFIG_CPU_SH2)	:= cpu-sh2
-cpuincdir-$(CONFIG_CPU_SH2A)	:= cpu-sh2a
-cpuincdir-$(CONFIG_CPU_SH3)	:= cpu-sh3
-cpuincdir-$(CONFIG_CPU_SH4)	:= cpu-sh4
-cpuincdir-$(CONFIG_CPU_SH5)	:= cpu-sh5
+#
+# CPU header paths
+#
+# These are ordered by optimization level. A CPU family that is a subset
+# of another (ie, SH-2A / SH-2), is picked up first, with increasing
+# levels of genericness if nothing more suitable is situated in the
+# hierarchy.
+#
+# As an example, in order of preference, SH-2A > SH-2 > common definitions.
+#
+cpuincdir-$(CONFIG_CPU_SH2A)	+= cpu-sh2a
+cpuincdir-$(CONFIG_CPU_SH2)	+= cpu-sh2
+cpuincdir-$(CONFIG_CPU_SH3)	+= cpu-sh3
+cpuincdir-$(CONFIG_CPU_SH4)	+= cpu-sh4
+cpuincdir-$(CONFIG_CPU_SH5)	+= cpu-sh5
+cpuincdir-y			+= cpu-common	# Must be last
 
 libs-$(CONFIG_SUPERH32)		:= arch/sh/lib/	$(libs-y)
 libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)
@@ -160,57 +154,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.
-
-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 $@
+cflags-y	+= $(foreach d, $(cpuincdir-y), -Iarch/sh/include/$(d)) \
+		   $(foreach d, $(machdir-y), -Iarch/sh/include/$(d))
 
-#	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 +173,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 +215,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

arch/sh/boards/Kconfig

View file

diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
new file mode 100644
index 0000000..ae19486
--- /dev/null
+++ b/arch/sh/boards/Kconfig
@@ -0,0 +1,258 @@
+menu "Board support"
+
+config SOLUTION_ENGINE
+	bool
+
+config SH_SOLUTION_ENGINE
+	bool "SolutionEngine"
+	select SOLUTION_ENGINE
+	select CPU_HAS_IPR_IRQ
+	depends on CPU_SUBTYPE_SH7705 || CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7710 || \
+	  CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7750S || \
+	  CPU_SUBTYPE_SH7750R 
+	help
+	  Select SolutionEngine if configuring for a Hitachi SH7705, SH7709,
+	  SH7710, SH7712, SH7750, SH7750S or SH7750R evaluation board.
+
+config SH_7206_SOLUTION_ENGINE
+	bool "SolutionEngine7206"
+	select SOLUTION_ENGINE
+	depends on CPU_SUBTYPE_SH7206
+	help
+	  Select 7206 SolutionEngine if configuring for a Hitachi SH7206
+	  evaluation board.
+
+config SH_7619_SOLUTION_ENGINE
+	bool "SolutionEngine7619"
+	select SOLUTION_ENGINE
+	depends on CPU_SUBTYPE_SH7619
+	help
+	  Select 7619 SolutionEngine if configuring for a Hitachi SH7619
+	  evaluation board.
+	
+config SH_7721_SOLUTION_ENGINE
+	bool "SolutionEngine7721"
+	select SOLUTION_ENGINE
+	depends on CPU_SUBTYPE_SH7721
+	help
+	  Select 7721 SolutionEngine if configuring for a Hitachi SH7721
+	  evaluation board.
+
+config SH_7722_SOLUTION_ENGINE
+	bool "SolutionEngine7722"
+	select SOLUTION_ENGINE
+	depends on CPU_SUBTYPE_SH7722
+	help
+	  Select 7722 SolutionEngine if configuring for a Hitachi SH772
+	  evaluation board.
+
+config SH_7751_SOLUTION_ENGINE
+	bool "SolutionEngine7751"
+	select SOLUTION_ENGINE
+	select CPU_HAS_IPR_IRQ
+	depends on CPU_SUBTYPE_SH7751
+	help
+	  Select 7751 SolutionEngine if configuring for a Hitachi SH7751
+	  evaluation board.
+	  
+config SH_7780_SOLUTION_ENGINE
+	bool "SolutionEngine7780"
+	select SOLUTION_ENGINE
+	select SYS_SUPPORTS_PCI
+	depends on CPU_SUBTYPE_SH7780
+	help
+	  Select 7780 SolutionEngine if configuring for a Renesas SH7780
+	  evaluation board.
+
+config SH_7343_SOLUTION_ENGINE
+	bool "SolutionEngine7343"
+	select SOLUTION_ENGINE
+	depends on CPU_SUBTYPE_SH7343
+	help
+	  Select 7343 SolutionEngine if configuring for a Hitachi
+	  SH7343 (SH-Mobile 3AS) evaluation board.
+
+config SH_7751_SYSTEMH
+	bool "SystemH7751R"
+	depends on CPU_SUBTYPE_SH7751R
+	help
+	  Select SystemH if you are configuring for a Renesas SystemH
+	  7751R evaluation board.
+
+config SH_HP6XX
+	bool "HP6XX"
+	select SYS_SUPPORTS_APM_EMULATION
+	select HD6446X_SERIES
+	depends on CPU_SUBTYPE_SH7709
+	help
+	  Select HP6XX if configuring for a HP jornada HP6xx.
+	  More information (hardware only) at
+	  <http://www.hp.com/jornada/>.
+
+config SH_DREAMCAST
+	bool "Dreamcast"
+	select SYS_SUPPORTS_PCI
+	depends on CPU_SUBTYPE_SH7091
+	help
+	  Select Dreamcast if configuring for a SEGA Dreamcast.
+	  More information at <http://www.linux-sh.org>
+
+config SH_SH03
+	bool "Interface CTP/PCI-SH03"
+	depends on CPU_SUBTYPE_SH7751
+	select CPU_HAS_IPR_IRQ
+	select SYS_SUPPORTS_PCI
+	help
+	  CTP/PCI-SH03 is a CPU module computer that is produced
+	  by Interface Corporation.
+	  More information at <http://www.interface.co.jp>
+
+config SH_SECUREEDGE5410
+	bool "SecureEdge5410"
+	depends on CPU_SUBTYPE_SH7751R
+	select CPU_HAS_IPR_IRQ
+	select SYS_SUPPORTS_PCI