Merge branch 'rmobile/mmcif' into rmobile-latest

2026-10-16 22:39:48 +00:00 · 2010-11-25 16:45:43 +09:00 · 2010-11-25 16:45:43 +09:00 · 1ad2096c4e
commit 1ad2096c4e
parent c4d73e7d75 df73af86b6
116 changed files with 8336 additions and 1942 deletions
--- a/Documentation/DocBook/sh.tmpl
+++ b/Documentation/DocBook/sh.tmpl
--- a/Documentation/fb/00-INDEX
+++ b/Documentation/fb/00-INDEX
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/sh/clk.txt
+++ b/Documentation/sh/clk.txt
--- a/6
+++ b/6
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
--- a/arch/arm/boot/compressed/vmlinux.lds.in
+++ b/arch/arm/boot/compressed/vmlinux.lds.in
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
--- a/arch/arm/include/asm/mmu.h
+++ b/arch/arm/include/asm/mmu.h
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
--- a/arch/arm/lib/findbit.S
+++ b/arch/arm/lib/findbit.S
--- a/arch/arm/mach-aaec2000/include/mach/vmalloc.h
+++ b/arch/arm/mach-aaec2000/include/mach/vmalloc.h
--- a/arch/arm/mach-bcmring/include/mach/vmalloc.h
+++ b/arch/arm/mach-bcmring/include/mach/vmalloc.h
--- a/arch/arm/mach-clps711x/include/mach/vmalloc.h
+++ b/arch/arm/mach-clps711x/include/mach/vmalloc.h
--- a/arch/arm/mach-ebsa110/include/mach/vmalloc.h
+++ b/arch/arm/mach-ebsa110/include/mach/vmalloc.h
--- a/arch/arm/mach-footbridge/include/mach/vmalloc.h
+++ b/arch/arm/mach-footbridge/include/mach/vmalloc.h
--- a/arch/arm/mach-h720x/include/mach/vmalloc.h
+++ b/arch/arm/mach-h720x/include/mach/vmalloc.h
--- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
--- a/arch/arm/mach-integrator/include/mach/vmalloc.h
+++ b/arch/arm/mach-integrator/include/mach/vmalloc.h
--- a/arch/arm/mach-msm/include/mach/vmalloc.h
+++ b/arch/arm/mach-msm/include/mach/vmalloc.h
--- a/arch/arm/mach-mx25/devices-imx25.h
+++ b/arch/arm/mach-mx25/devices-imx25.h
--- a/arch/arm/mach-mx3/mach-pcm037_eet.c
+++ b/arch/arm/mach-mx3/mach-pcm037_eet.c
--- a/arch/arm/mach-netx/include/mach/vmalloc.h
+++ b/arch/arm/mach-netx/include/mach/vmalloc.h
--- a/arch/arm/mach-omap1/include/mach/vmalloc.h
+++ b/arch/arm/mach-omap1/include/mach/vmalloc.h
--- a/arch/arm/mach-omap2/include/mach/vmalloc.h
+++ b/arch/arm/mach-omap2/include/mach/vmalloc.h
--- a/arch/arm/mach-pnx4008/include/mach/vmalloc.h
+++ b/arch/arm/mach-pnx4008/include/mach/vmalloc.h
--- a/arch/arm/mach-rpc/include/mach/vmalloc.h
+++ b/arch/arm/mach-rpc/include/mach/vmalloc.h
--- a/arch/arm/mach-shark/include/mach/vmalloc.h
+++ b/arch/arm/mach-shark/include/mach/vmalloc.h
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/include/mach/sh7372.h
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
--- a/arch/arm/mach-versatile/include/mach/vmalloc.h
+++ b/arch/arm/mach-versatile/include/mach/vmalloc.h
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
--- a/arch/arm/plat-mxc/devices/platform-imx-dma.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c
--- a/arch/arm/plat-mxc/devices/platform-spi_imx.c
+++ b/arch/arm/plat-mxc/devices/platform-spi_imx.c
--- a/arch/arm/plat-nomadik/timer.c
+++ b/arch/arm/plat-nomadik/timer.c
--- a/arch/sh/include/asm/processor_32.h
+++ b/arch/sh/include/asm/processor_32.h
--- a/arch/sh/kernel/cpu/sh4/clock-sh4-202.c
+++ b/arch/sh/kernel/cpu/sh4/clock-sh4-202.c
--- a/arch/sh/kernel/sys_sh.c
+++ b/arch/sh/kernel/sys_sh.c
--- a/arch/sh/kernel/vsyscall/vsyscall-trapa.S
+++ b/arch/sh/kernel/vsyscall/vsyscall-trapa.S
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
--- a/arch/tile/include/asm/cacheflush.h
+++ b/arch/tile/include/asm/cacheflush.h
--- a/arch/tile/include/asm/io.h
+++ b/arch/tile/include/asm/io.h
--- a/arch/tile/include/asm/pci-bridge.h
+++ b/arch/tile/include/asm/pci-bridge.h
--- a/arch/tile/include/asm/pci.h
+++ b/arch/tile/include/asm/pci.h
--- a/arch/tile/include/asm/processor.h
+++ b/arch/tile/include/asm/processor.h
--- a/arch/tile/include/hv/drv_xgbe_impl.h
+++ b/arch/tile/include/hv/drv_xgbe_impl.h
--- a/arch/tile/include/hv/drv_xgbe_intf.h
+++ b/arch/tile/include/hv/drv_xgbe_intf.h
--- a/arch/tile/include/hv/netio_errors.h
+++ b/arch/tile/include/hv/netio_errors.h
--- a/arch/tile/include/hv/netio_intf.h
+++ b/arch/tile/include/hv/netio_intf.h
--- a/arch/tile/kernel/Makefile
+++ b/arch/tile/kernel/Makefile
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
--- a/arch/tile/lib/memchr_32.c
+++ b/arch/tile/lib/memchr_32.c
--- a/arch/tile/lib/spinlock_32.c
+++ b/arch/tile/lib/spinlock_32.c
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
--- a/drivers/hwmon/i5k_amb.c
+++ b/drivers/hwmon/i5k_amb.c
--- a/drivers/hwmon/lis3lv02d_i2c.c
+++ b/drivers/hwmon/lis3lv02d_i2c.c
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
--- a/drivers/leds/leds-ss4200.c
+++ b/drivers/leds/leds-ss4200.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
--- a/drivers/misc/isl29020.c
+++ b/drivers/misc/isl29020.c
--- a/drivers/misc/sgi-xp/xpc_partition.c
+++ b/drivers/misc/sgi-xp/xpc_partition.c
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
--- a/drivers/net/tile/Makefile
+++ b/drivers/net/tile/Makefile
--- a/drivers/net/tile/tilepro.c
+++ b/drivers/net/tile/tilepro.c
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
--- a/drivers/scsi/arm/fas216.h
+++ b/drivers/scsi/arm/fas216.h
--- a/drivers/sh/clk/core.c
+++ b/drivers/sh/clk/core.c
--- a/drivers/sh/clk/cpg.c
+++ b/drivers/sh/clk/cpg.c
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
--- a/drivers/video/geode/lxfb_ops.c
+++ b/drivers/video/geode/lxfb_ops.c
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
--- a/drivers/video/sis/init.c
+++ b/drivers/video/sis/init.c
--- a/drivers/video/sis/init.h
+++ b/drivers/video/sis/init.h
--- a/drivers/video/sis/init301.c
+++ b/drivers/video/sis/init301.c
--- a/drivers/video/sis/init301.h
+++ b/drivers/video/sis/init301.h
--- a/drivers/video/sis/initextlfb.c
+++ b/drivers/video/sis/initextlfb.c
--- a/drivers/video/sis/osdef.h
+++ b/drivers/video/sis/osdef.h
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
--- a/drivers/video/sis/vgatypes.h
+++ b/drivers/video/sis/vgatypes.h
--- a/drivers/video/sis/vstruct.h
+++ b/drivers/video/sis/vstruct.h
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
--- a/Show more
+++ b/Show more