diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 10:53:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 10:53:43 -0700 |
commit | 00e9028a95fb8a4d79f2fb695a853f33ea7d3b57 (patch) | |
tree | 2dea2ae498a6ce57de8890e87185aca5e9f3ad2d /arch/sh | |
parent | 57b1494d2ba544c62673234da6115c21fac27ffc (diff) | |
parent | 7cb93181629c613ee2b8f4ffe3446f8003074842 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 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.
...
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/Kconfig | 252 | ||||
-rw-r--r-- | arch/sh/Makefile | 139 | ||||
-rw-r--r-- | arch/sh/boards/Kconfig | 258 | ||||
-rw-r--r-- | arch/sh/boards/Makefile | 8 | ||||
-rw-r--r-- | arch/sh/boards/board-ap325rxa.c (renamed from arch/sh/boards/renesas/ap325rxa/setup.c) | 4 | ||||
-rw-r--r-- | arch/sh/boards/board-magicpanelr2.c (renamed from arch/sh/boards/magicpanelr2/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/board-rsk7203.c (renamed from arch/sh/boards/renesas/rsk7203/setup.c) | 10 | ||||
-rw-r--r-- | arch/sh/boards/board-sh7785lcr.c (renamed from arch/sh/boards/renesas/sh7785lcr/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/board-shmin.c (renamed from arch/sh/boards/shmin/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-cayman/Makefile (renamed from arch/sh/boards/cayman/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-cayman/irq.c (renamed from arch/sh/boards/cayman/irq.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-cayman/led.c (renamed from arch/sh/boards/cayman/led.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-cayman/setup.c (renamed from arch/sh/boards/cayman/setup.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-dreamcast/Makefile (renamed from arch/sh/boards/dreamcast/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-dreamcast/irq.c (renamed from arch/sh/boards/dreamcast/irq.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-dreamcast/rtc.c (renamed from arch/sh/boards/dreamcast/rtc.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-dreamcast/setup.c (renamed from arch/sh/boards/dreamcast/setup.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-edosk7705/Makefile (renamed from arch/sh/boards/renesas/edosk7705/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-edosk7705/io.c (renamed from arch/sh/boards/renesas/edosk7705/io.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-edosk7705/setup.c (renamed from arch/sh/boards/renesas/edosk7705/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-highlander/Kconfig (renamed from arch/sh/boards/renesas/r7780rp/Kconfig) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-highlander/Makefile (renamed from arch/sh/boards/renesas/r7780rp/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-highlander/irq-r7780mp.c (renamed from arch/sh/boards/renesas/r7780rp/irq-r7780mp.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-highlander/irq-r7780rp.c (renamed from arch/sh/boards/renesas/r7780rp/irq-r7780rp.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-highlander/irq-r7785rp.c (renamed from arch/sh/boards/renesas/r7780rp/irq-r7785rp.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-highlander/psw.c (renamed from arch/sh/boards/renesas/r7780rp/psw.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-highlander/setup.c (renamed from arch/sh/boards/renesas/r7780rp/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-hp6xx/Makefile (renamed from arch/sh/boards/hp6xx/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-hp6xx/hp6xx_apm.c (renamed from arch/sh/boards/hp6xx/hp6xx_apm.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-hp6xx/pm.c (renamed from arch/sh/boards/hp6xx/pm.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-hp6xx/pm_wakeup.S (renamed from arch/sh/boards/hp6xx/pm_wakeup.S) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-hp6xx/setup.c (renamed from arch/sh/boards/hp6xx/setup.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-landisk/Makefile (renamed from arch/sh/boards/landisk/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-landisk/gio.c (renamed from arch/sh/boards/landisk/gio.c) | 4 | ||||
-rw-r--r-- | arch/sh/boards/mach-landisk/irq.c (renamed from arch/sh/boards/landisk/irq.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-landisk/psw.c (renamed from arch/sh/boards/landisk/psw.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-landisk/setup.c (renamed from arch/sh/boards/landisk/setup.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-lboxre2/Makefile (renamed from arch/sh/boards/lboxre2/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-lboxre2/irq.c (renamed from arch/sh/boards/lboxre2/irq.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-lboxre2/setup.c (renamed from arch/sh/boards/lboxre2/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-microdev/Makefile (renamed from arch/sh/boards/superh/microdev/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-microdev/io.c (renamed from arch/sh/boards/superh/microdev/io.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-microdev/irq.c (renamed from arch/sh/boards/superh/microdev/irq.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-microdev/led.c (renamed from arch/sh/boards/superh/microdev/led.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-microdev/setup.c (renamed from arch/sh/boards/superh/microdev/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-migor/Kconfig (renamed from arch/sh/boards/renesas/migor/Kconfig) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-migor/Makefile (renamed from arch/sh/boards/renesas/migor/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-migor/lcd_qvga.c (renamed from arch/sh/boards/renesas/migor/lcd_qvga.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-migor/setup.c (renamed from arch/sh/boards/renesas/migor/setup.c) | 4 | ||||
-rw-r--r-- | arch/sh/boards/mach-r2d/Kconfig (renamed from arch/sh/boards/renesas/rts7751r2d/Kconfig) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-r2d/Makefile (renamed from arch/sh/boards/renesas/rts7751r2d/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-r2d/irq.c (renamed from arch/sh/boards/renesas/rts7751r2d/irq.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-r2d/setup.c (renamed from arch/sh/boards/renesas/rts7751r2d/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-sdk7780/Kconfig (renamed from arch/sh/boards/renesas/sdk7780/Kconfig) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-sdk7780/Makefile (renamed from arch/sh/boards/renesas/sdk7780/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-sdk7780/irq.c (renamed from arch/sh/boards/renesas/sdk7780/irq.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-sdk7780/setup.c (renamed from arch/sh/boards/renesas/sdk7780/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7206/Makefile (renamed from arch/sh/boards/se/7206/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7206/io.c (renamed from arch/sh/boards/se/7206/io.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7206/irq.c (renamed from arch/sh/boards/se/7206/irq.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7206/setup.c (renamed from arch/sh/boards/se/7206/setup.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7343/Makefile (renamed from arch/sh/boards/se/7343/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7343/io.c (renamed from arch/sh/boards/se/7343/io.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7343/irq.c (renamed from arch/sh/boards/se/7343/irq.c) | 6 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7343/setup.c (renamed from arch/sh/boards/se/7343/setup.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/770x/Makefile (renamed from arch/sh/boards/se/770x/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/770x/io.c (renamed from arch/sh/boards/se/770x/io.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/770x/irq.c (renamed from arch/sh/boards/se/770x/irq.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/770x/setup.c (renamed from arch/sh/boards/se/770x/setup.c) | 8 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7721/Makefile (renamed from arch/sh/boards/se/7721/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7721/irq.c (renamed from arch/sh/boards/se/7721/irq.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7721/setup.c (renamed from arch/sh/boards/se/7721/setup.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7722/Makefile (renamed from arch/sh/boards/se/7722/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7722/irq.c (renamed from arch/sh/boards/se/7722/irq.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7722/setup.c (renamed from arch/sh/boards/se/7722/setup.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7751/Makefile (renamed from arch/sh/boards/se/7751/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7751/io.c (renamed from arch/sh/boards/se/7751/io.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7751/irq.c (renamed from arch/sh/boards/se/7751/irq.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7751/pci.c (renamed from arch/sh/boards/se/7751/pci.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7751/setup.c (renamed from arch/sh/boards/se/7751/setup.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7780/Makefile (renamed from arch/sh/boards/se/7780/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7780/irq.c (renamed from arch/sh/boards/se/7780/irq.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7780/setup.c (renamed from arch/sh/boards/se/7780/setup.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/Makefile | 9 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/board-se7619.c (renamed from arch/sh/boards/se/7619/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-sh03/Makefile (renamed from arch/sh/boards/sh03/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-sh03/rtc.c (renamed from arch/sh/boards/sh03/rtc.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-sh03/setup.c (renamed from arch/sh/boards/sh03/setup.c) | 4 | ||||
-rw-r--r-- | arch/sh/boards/mach-sh7763rdp/Makefile (renamed from arch/sh/boards/renesas/sh7763rdp/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-sh7763rdp/irq.c (renamed from arch/sh/boards/renesas/sh7763rdp/irq.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-sh7763rdp/setup.c (renamed from arch/sh/boards/renesas/sh7763rdp/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-snapgear/Makefile (renamed from arch/sh/boards/snapgear/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-snapgear/io.c (renamed from arch/sh/boards/snapgear/io.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-snapgear/setup.c (renamed from arch/sh/boards/snapgear/setup.c) | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-systemh/Makefile (renamed from arch/sh/boards/renesas/systemh/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-systemh/io.c (renamed from arch/sh/boards/renesas/systemh/io.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-systemh/irq.c (renamed from arch/sh/boards/renesas/systemh/irq.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-systemh/setup.c (renamed from arch/sh/boards/renesas/systemh/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-titan/Makefile (renamed from arch/sh/boards/titan/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-titan/io.c (renamed from arch/sh/boards/titan/io.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-titan/setup.c (renamed from arch/sh/boards/titan/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-x3proto/Makefile (renamed from arch/sh/boards/renesas/x3proto/Makefile) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-x3proto/ilsel.c (renamed from arch/sh/boards/renesas/x3proto/ilsel.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/mach-x3proto/setup.c (renamed from arch/sh/boards/renesas/x3proto/setup.c) | 0 | ||||
-rw-r--r-- | arch/sh/boards/magicpanelr2/Kconfig | 13 | ||||
-rw-r--r-- | arch/sh/boards/magicpanelr2/Makefile | 5 | ||||
-rw-r--r-- | arch/sh/boards/renesas/ap325rxa/Makefile | 1 | ||||
-rw-r--r-- | arch/sh/boards/renesas/rsk7203/Makefile | 1 | ||||
-rw-r--r-- | arch/sh/boards/renesas/sh7785lcr/Makefile | 1 | ||||
-rw-r--r-- | arch/sh/boards/se/7619/Makefile | 5 | ||||
-rw-r--r-- | arch/sh/boards/shmin/Makefile | 5 | ||||
-rw-r--r-- | arch/sh/boot/Makefile | 3 | ||||
-rw-r--r-- | arch/sh/boot/compressed/head_64.S | 4 | ||||
-rw-r--r-- | arch/sh/configs/ap325rxa_defconfig | 35 | ||||
-rw-r--r-- | arch/sh/configs/dreamcast_defconfig | 304 | ||||
-rw-r--r-- | arch/sh/configs/hp6xx_defconfig | 258 | ||||
-rw-r--r-- | arch/sh/configs/landisk_defconfig | 894 | ||||
-rw-r--r-- | arch/sh/configs/lboxre2_defconfig | 725 | ||||
-rw-r--r-- | arch/sh/configs/magicpanelr2_defconfig | 195 | ||||
-rw-r--r-- | arch/sh/configs/microdev_defconfig | 630 | ||||
-rw-r--r-- | arch/sh/configs/migor_defconfig | 63 | ||||
-rw-r--r-- | arch/sh/c |