Merge branch 'sh/driver-core' into sh/clkfwk

2026-09-28 19:20:30 +00:00 · 2010-03-10 16:41:57 +09:00 · 2010-03-10 16:41:57 +09:00 · d28c145deb
commit d28c145deb
parent 2e733b3f84 ec0ffe2ee0
287 changed files with 4239 additions and 2460 deletions
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
--- a/Documentation/kobject.txt
+++ b/Documentation/kobject.txt
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
--- a/4
+++ b/4
--- a/arch/arm/mach-ep93xx/include/mach/ts72xx.h
+++ b/arch/arm/mach-ep93xx/include/mach/ts72xx.h
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
--- a/arch/arm/mach-pxa/corgi_ssp.c
+++ b/arch/arm/mach-pxa/corgi_ssp.c
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
--- a/arch/arm/mach-s3c2410/h1940-bluetooth.c
+++ b/arch/arm/mach-s3c2410/h1940-bluetooth.c
--- a/arch/arm/mach-sa1100/jornada720_ssp.c
+++ b/arch/arm/mach-sa1100/jornada720_ssp.c
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
--- a/arch/mips/txx9/generic/7segled.c
+++ b/arch/mips/txx9/generic/7segled.c
--- a/arch/powerpc/kernel/cacheinfo.c
+++ b/arch/powerpc/kernel/cacheinfo.c
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
--- a/arch/s390/include/asm/qdio.h
+++ b/arch/s390/include/asm/qdio.h
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
--- a/arch/s390/lib/Makefile
+++ b/arch/s390/lib/Makefile
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
--- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
--- a/arch/sh/kernel/cpu/sh2a/setup-mxg.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
--- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
--- a/arch/sh/kernel/cpu/sh3/setup-sh770x.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
--- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
--- a/arch/sh/kernel/cpu/sh3/setup-sh7720.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
--- a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
--- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
--- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
--- a/arch/sh/kernel/cpu/sh5/setup-sh5.c
+++ b/arch/sh/kernel/cpu/sh5/setup-sh5.c
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
--- a/block/elevator.c
+++ b/block/elevator.c
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
--- a/drivers/auxdisplay/cfag12864bfb.c
+++ b/drivers/auxdisplay/cfag12864bfb.c
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
--- a/drivers/block/osdblk.c
+++ b/drivers/block/osdblk.c
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
--- a/drivers/char/hvc_iucv.c
+++ b/drivers/char/hvc_iucv.c
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
--- a/drivers/clocksource/sh_mtu2.c
+++ b/drivers/clocksource/sh_mtu2.c
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
--- a/drivers/dma/ioat/dma.h
+++ b/drivers/dma/ioat/dma.h
--- a/drivers/edac/edac_device_sysfs.c
+++ b/drivers/edac/edac_device_sysfs.c
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
--- a/drivers/edac/edac_pci_sysfs.c
+++ b/drivers/edac/edac_pci_sysfs.c
--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
--- a/drivers/firmware/memmap.c
+++ b/drivers/firmware/memmap.c
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
--- a/drivers/gpu/drm/ttm/ttm_memory.c
+++ b/drivers/gpu/drm/ttm/ttm_memory.c
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
--- a/drivers/macintosh/windfarm_smu_controls.c
+++ b/drivers/macintosh/windfarm_smu_controls.c
--- a/drivers/md/dm-sysfs.c
+++ b/drivers/md/dm-sysfs.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
--- a/Show more
+++ b/Show more