Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 17:13:19 +0000 (09:13 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 17:13:19 +0000 (09:13 -0800)
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  hwmon: Add MAINTAINERS entry for new ams driver
  hwmon: New AMS hardware monitoring driver
  hwmon/w83793: Add documentation and maintainer
  hwmon: New Winbond W83793 hardware monitoring driver
  hwmon: Update Rudolf Marek's e-mail address
  hwmon/f71805f: Fix the device address decoding
  hwmon/f71805f: Always create all fan inputs
  hwmon/f71805f: Add support for the Fintek F71872F/FG chip
  hwmon: New PC87427 hardware monitoring driver
  hwmon/it87: Remove the SMBus interface support
  hwmon/hdaps: Update the list of supported devices
  hwmon/hdaps: Move the DMI detection data to .data
  hwmon/pc87360: Autodetect the VRM version
  hwmon/f71805f: Document the fan control features
  hwmon/f71805f: Add support for "speed mode" fan speed control
  hwmon/f71805f: Support DC fan speed control mode
  hwmon/f71805f: Let the user adjust the PWM base frequency
  hwmon/f71805f: Add manual fan speed control
  hwmon/f71805f: Store the fan control registers

1096 files changed:
Documentation/CodingStyle
Documentation/SubmitChecklist
Documentation/accounting/getdelays.c
Documentation/cpu-freq/core.txt
Documentation/dvb/cards.txt
Documentation/feature-removal-schedule.txt
Documentation/filesystems/bfs.txt
Documentation/filesystems/ocfs2.txt
Documentation/i2c/busses/i2c-amd8111
Documentation/i2c/busses/i2c-i801
Documentation/i2c/busses/i2c-nforce2
Documentation/ioctl/ioctl-decoding.txt [new file with mode: 0644]
Documentation/kbuild/kconfig-language.txt
Documentation/kernel-parameters.txt
Documentation/networking/dccp.txt
Documentation/spi/pxa2xx
Documentation/video4linux/CARDLIST.cx88
Documentation/video4linux/CARDLIST.saa7134
Documentation/video4linux/cafe_ccic [new file with mode: 0644]
Documentation/video4linux/zr36120.txt [deleted file]
MAINTAINERS
Makefile
arch/alpha/kernel/osf_sys.c
arch/arm/kernel/apm.c
arch/arm/kernel/ecard.c
arch/arm/mach-omap1/Kconfig
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-pnx4008/Makefile
arch/arm/mach-pnx4008/i2c.c [new file with mode: 0644]
arch/arm/mach-pxa/Kconfig
arch/arm/mach-realview/core.c
arch/arm/mach-realview/core.h
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-versatile/core.c
arch/arm/plat-omap/Kconfig
arch/arm26/kernel/ecard.c
arch/arm26/kernel/irq.c
arch/avr32/boards/atstk1000/atstk1002.c
arch/avr32/kernel/avr32_ksyms.c
arch/avr32/kernel/process.c
arch/avr32/kernel/setup.c
arch/avr32/lib/delay.c
arch/avr32/mach-at32ap/at32ap7000.c
arch/avr32/mach-at32ap/extint.c
arch/avr32/mach-at32ap/intc.c
arch/avr32/mach-at32ap/pio.c
arch/avr32/mach-at32ap/sm.c [deleted file]
arch/cris/arch-v10/drivers/axisflashmap.c
arch/cris/arch-v10/drivers/gpio.c
arch/cris/arch-v32/drivers/axisflashmap.c
arch/cris/arch-v32/drivers/gpio.c
arch/cris/arch-v32/kernel/signal.c
arch/cris/kernel/profile.c
arch/frv/kernel/pm.c
arch/h8300/kernel/ints.c
arch/h8300/platform/h8s/ints.c
arch/i386/kernel/apm.c
arch/i386/kernel/cpu/cpufreq/Kconfig
arch/i386/kernel/cpu/cpufreq/Makefile
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
arch/i386/kernel/cpu/cpufreq/longhaul.c
arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
arch/i386/kernel/cpu/cpufreq/sc520_freq.c
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
arch/i386/kernel/cpu/cpufreq/speedstep-lib.h
arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
arch/i386/kernel/microcode.c
arch/i386/kernel/smpboot.c
arch/ia64/hp/sim/simserial.c
arch/ia64/kernel/Makefile
arch/ia64/kernel/crash.c
arch/ia64/kernel/crash_dump.c [new file with mode: 0644]
arch/ia64/kernel/jprobes.S
arch/ia64/kernel/kprobes.c
arch/ia64/kernel/machine_kexec.c
arch/ia64/kernel/mca.c
arch/ia64/kernel/setup.c
arch/ia64/kernel/smp.c
arch/ia64/kernel/traps.c
arch/ia64/mm/contig.c
arch/ia64/mm/init.c
arch/ia64/sn/kernel/setup.c
arch/ia64/sn/kernel/sn2/sn_hwperf.c
arch/ia64/sn/kernel/xpc_channel.c
arch/ia64/sn/kernel/xpc_main.c
arch/m68k/mm/kmap.c
arch/mips/configs/malta_defconfig
arch/mips/kernel/apm.c
arch/mips/kernel/kspd.c
arch/mips/kernel/reset.c
arch/mips/kernel/vmlinux.lds.S
arch/mips/lasat/sysctl.c
arch/mips/lib/csum_partial_copy.c
arch/mips/mips-boards/malta/Makefile
arch/mips/mips-boards/malta/malta_setup.c
arch/mips/mm/cache.c
arch/mips/mm/init.c
arch/parisc/hpux/sys_hpux.c
arch/parisc/kernel/unwind.c
arch/powerpc/Kconfig
arch/powerpc/configs/ps3_defconfig
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/cputable.c
arch/powerpc/kernel/head_32.S
arch/powerpc/kernel/module_32.c
arch/powerpc/kernel/module_64.c
arch/powerpc/kernel/nvram_64.c
arch/powerpc/kernel/of_device.c
arch/powerpc/kernel/of_platform.c
arch/powerpc/kernel/pci_32.c
arch/powerpc/kernel/pci_64.c
arch/powerpc/kernel/ppc_ksyms.c
arch/powerpc/kernel/prom.c
arch/powerpc/kernel/prom_init.c
arch/powerpc/kernel/rtas.c
arch/powerpc/kernel/sysfs.c
arch/powerpc/kernel/traps.c
arch/powerpc/kernel/vmlinux.lds.S
arch/powerpc/mm/imalloc.c
arch/powerpc/mm/numa.c
arch/powerpc/platforms/4xx/Kconfig
arch/powerpc/platforms/52xx/lite5200.c
arch/powerpc/platforms/cell/cbe_thermal.c
arch/powerpc/platforms/cell/pmu.c
arch/powerpc/platforms/cell/spufs/coredump.c
arch/powerpc/platforms/embedded6xx/Kconfig
arch/powerpc/platforms/maple/pci.c
arch/powerpc/platforms/maple/setup.c
arch/powerpc/platforms/ps3/Kconfig
arch/powerpc/platforms/pseries/Makefile
arch/powerpc/platforms/pseries/eeh.c
arch/powerpc/platforms/pseries/eeh_cache.c
arch/powerpc/platforms/pseries/eeh_driver.c
arch/powerpc/platforms/pseries/hotplug-cpu.c [new file with mode: 0644]
arch/powerpc/platforms/pseries/setup.c
arch/powerpc/platforms/pseries/smp.c
arch/powerpc/sysdev/Makefile
arch/powerpc/sysdev/dcr.S [deleted file]
arch/powerpc/sysdev/qe_lib/qe_ic.c
arch/powerpc/sysdev/rom.c
arch/powerpc/xmon/xmon.c
arch/ppc/8260_io/fcc_enet.c
arch/ppc/8xx_io/cs4218_tdm.c
arch/ppc/Kconfig
arch/ppc/kernel/pci.c
arch/ppc/platforms/4xx/Kconfig
arch/s390/Kconfig
arch/s390/kernel/debug.c
arch/s390/kernel/s390_ext.c
arch/sh/Kconfig
arch/sh/Kconfig.debug
arch/sh/Makefile
arch/sh/boards/landisk/irq.c
arch/sh/boards/se/7206/irq.c
arch/sh/boards/se/7619/Makefile
arch/sh/boards/se/7619/io.c [deleted file]
arch/sh/boards/se/7619/setup.c
arch/sh/boot/Makefile
arch/sh/boot/compressed/Makefile
arch/sh/boot/compressed/head.S
arch/sh/boot/compressed/misc.c
arch/sh/configs/landisk_defconfig
arch/sh/configs/se7206_defconfig
arch/sh/configs/se7619_defconfig [new file with mode: 0644]
arch/sh/drivers/push-switch.c
arch/sh/kernel/cpu/Makefile
arch/sh/kernel/cpu/sh2/entry.S
arch/sh/kernel/cpu/sh2/setup-sh7619.c
arch/sh/kernel/cpu/sh2a/setup-sh7206.c
arch/sh/kernel/cpu/sh4/Makefile
arch/sh/kernel/cpu/sh4/probe.c
arch/sh/kernel/cpu/sh4/setup-sh7750.c
arch/sh/kernel/cpu/sh4/sq.c
arch/sh/kernel/cpu/sh4a/Makefile [new file with mode: 0644]
arch/sh/kernel/cpu/sh4a/clock-sh73180.c [moved from arch/sh/kernel/cpu/sh4/clock-sh73180.c with 100% similarity]
arch/sh/kernel/cpu/sh4a/clock-sh7343.c [new file with mode: 0644]
arch/sh/kernel/cpu/sh4a/clock-sh7770.c [moved from arch/sh/kernel/cpu/sh4/clock-sh7770.c with 100% similarity]
arch/sh/kernel/cpu/sh4a/clock-sh7780.c [moved from arch/sh/kernel/cpu/sh4/clock-sh7780.c with 100% similarity]
arch/sh/kernel/cpu/sh4a/setup-sh73180.c [moved from arch/sh/kernel/cpu/sh4/setup-sh73180.c with 100% similarity]
arch/sh/kernel/cpu/sh4a/setup-sh7343.c [moved from arch/sh/kernel/cpu/sh4/setup-sh7343.c with 100% similarity]
arch/sh/kernel/cpu/sh4a/setup-sh7722.c [new file with mode: 0644]
arch/sh/kernel/cpu/sh4a/setup-sh7770.c [moved from arch/sh/kernel/cpu/sh4/setup-sh7770.c with 100% similarity]
arch/sh/kernel/cpu/sh4a/setup-sh7780.c [moved from arch/sh/kernel/cpu/sh4/setup-sh7780.c with 100% similarity]
arch/sh/kernel/early_printk.c
arch/sh/kernel/entry-common.S
arch/sh/kernel/head.S
arch/sh/kernel/process.c
arch/sh/kernel/setup.c
arch/sh/kernel/sh_ksyms.c
arch/sh/kernel/signal.c
arch/sh/kernel/sys_sh.c
arch/sh/kernel/traps.c
arch/sh/kernel/vmlinux.lds.S
arch/sh/mm/Kconfig
arch/sh/mm/cache-sh4.c
arch/sh/mm/init.c
arch/sparc/kernel/ioport.c
arch/sparc/kernel/irq.c
arch/sparc/kernel/of_device.c
arch/sparc/kernel/ptrace.c
arch/sparc/kernel/sun4d_irq.c
arch/sparc/mm/io-unit.c
arch/sparc64/Kconfig
arch/sparc64/Kconfig.debug
arch/sparc64/defconfig
arch/sparc64/kernel/Makefile
arch/sparc64/kernel/chmc.c
arch/sparc64/kernel/entry.S
arch/sparc64/kernel/head.S
arch/sparc64/kernel/isa.c
arch/sparc64/kernel/kprobes.c
arch/sparc64/kernel/of_device.c
arch/sparc64/kernel/pci_sun4v.c
arch/sparc64/kernel/ptrace.c
arch/sparc64/kernel/rtrap.S
arch/sparc64/kernel/stacktrace.c [new file with mode: 0644]
arch/sparc64/kernel/sun4v_ivec.S
arch/sparc64/kernel/sys_sunos32.c
arch/sparc64/kernel/traps.c
arch/sparc64/kernel/unaligned.c
arch/sparc64/kernel/visemul.c
arch/sparc64/mm/ultra.S
arch/um/drivers/net_kern.c
arch/um/include/net_kern.h
arch/um/sys-i386/ldt.c
arch/v850/Kconfig
arch/x86_64/Kconfig
arch/x86_64/kernel/cpufreq/Kconfig
arch/x86_64/kernel/cpufreq/Makefile
arch/x86_64/kernel/vsyscall.c
arch/xtensa/Kconfig
arch/xtensa/Makefile
arch/xtensa/boot/boot-elf/bootstrap.S
arch/xtensa/boot/boot-redboot/bootstrap.S
arch/xtensa/configs/iss_defconfig
arch/xtensa/kernel/Makefile
arch/xtensa/kernel/align.S
arch/xtensa/kernel/asm-offsets.c
arch/xtensa/kernel/coprocessor.S
arch/xtensa/kernel/entry.S
arch/xtensa/kernel/head.S
arch/xtensa/kernel/irq.c
arch/xtensa/kernel/pci-dma.c
arch/xtensa/kernel/process.c
arch/xtensa/kernel/ptrace.c
arch/xtensa/kernel/setup.c
arch/xtensa/kernel/signal.c
arch/xtensa/kernel/syscall.c [new file with mode: 0644]
arch/xtensa/kernel/syscalls.c [deleted file]
arch/xtensa/kernel/syscalls.h [deleted file]
arch/xtensa/kernel/time.c
arch/xtensa/kernel/traps.c
arch/xtensa/kernel/vectors.S
arch/xtensa/kernel/vmlinux.lds.S
arch/xtensa/lib/checksum.S
arch/xtensa/lib/memcopy.S
arch/xtensa/lib/memset.S
arch/xtensa/lib/strncpy_user.S
arch/xtensa/lib/strnlen_user.S
arch/xtensa/lib/usercopy.S
arch/xtensa/mm/fault.c
arch/xtensa/mm/init.c
arch/xtensa/mm/misc.S
arch/xtensa/mm/tlb.c
arch/xtensa/platform-iss/console.c
arch/xtensa/platform-iss/network.c
block/ll_rw_blk.c
block/scsi_ioctl.c
crypto/blkcipher.c
crypto/sha512.c
drivers/Kconfig
drivers/Makefile
drivers/acorn/block/fd1772.c
drivers/acorn/char/i2c.c
drivers/ata/pdc_adma.c
drivers/atm/.gitignore
drivers/atm/eni.c
drivers/atm/he.c
drivers/atm/lanai.c
drivers/atm/nicstar.c
drivers/atm/zatm.c
drivers/base/dmapool.c
drivers/block/Kconfig
drivers/block/Makefile
drivers/block/cciss.c
drivers/block/cpqarray.c
drivers/block/swim_iop.c [deleted file]
drivers/cdrom/cdrom.c
drivers/cdrom/cm206.c
drivers/char/Kconfig
drivers/char/agp/Kconfig
drivers/char/agp/generic.c
drivers/char/consolemap.c
drivers/char/ipmi/ipmi_bt_sm.c
drivers/char/ipmi/ipmi_devintf.c
drivers/char/ipmi/ipmi_msghandler.c
drivers/char/ipmi/ipmi_poweroff.c
drivers/char/ipmi/ipmi_si_intf.c
drivers/char/ipmi/ipmi_watchdog.c
drivers/char/lcd.c
drivers/char/lp.c
drivers/char/mem.c
drivers/char/mxser_new.c
drivers/char/n_r3964.c
drivers/char/n_tty.c
drivers/char/pcmcia/synclink_cs.c
drivers/char/random.c
drivers/char/rio/riocmd.c
drivers/char/rtc.c
drivers/char/sx.c
drivers/char/synclink.c
drivers/char/synclinkmp.c
drivers/char/sysrq.c
drivers/char/tty_io.c
drivers/char/viocons.c
drivers/char/vt.c
drivers/char/vt_ioctl.c
drivers/char/watchdog/at91rm9200_wdt.c
drivers/char/watchdog/mpcore_wdt.c
drivers/char/watchdog/omap_wdt.c
drivers/char/watchdog/pcwd_usb.c
drivers/char/watchdog/rm9k_wdt.c
drivers/clocksource/acpi_pm.c
drivers/cpufreq/cpufreq.c
drivers/cpufreq/cpufreq_conservative.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/cpufreq/cpufreq_performance.c
drivers/cpufreq/cpufreq_powersave.c
drivers/cpufreq/cpufreq_stats.c
drivers/cpufreq/cpufreq_userspace.c
drivers/cpufreq/freq_table.c
drivers/crypto/Kconfig
drivers/fc4/fc.c
drivers/i2c/algos/Kconfig
drivers/i2c/algos/Makefile
drivers/i2c/algos/i2c-algo-bit.c
drivers/i2c/algos/i2c-algo-ite.c [deleted file]
drivers/i2c/algos/i2c-algo-ite.h [deleted file]
drivers/i2c/algos/i2c-algo-pca.c
drivers/i2c/algos/i2c-algo-pcf.c
drivers/i2c/algos/i2c-algo-sgi.c
drivers/i2c/busses/Kconfig
drivers/i2c/busses/Makefile
drivers/i2c/busses/i2c-at91.c [new file with mode: 0644]
drivers/i2c/busses/i2c-elektor.c
drivers/i2c/busses/i2c-hydra.c
drivers/i2c/busses/i2c-i801.c
drivers/i2c/busses/i2c-i810.c
drivers/i2c/busses/i2c-ibm_iic.c
drivers/i2c/busses/i2c-ite.c [deleted file]
drivers/i2c/busses/i2c-ixp2000.c
drivers/i2c/busses/i2c-ixp4xx.c
drivers/i2c/busses/i2c-nforce2.c
drivers/i2c/busses/i2c-omap.c
drivers/i2c/busses/i2c-parport-light.c
drivers/i2c/busses/i2c-parport.c
drivers/i2c/busses/i2c-pca-isa.c
drivers/i2c/busses/i2c-pnx.c [new file with mode: 0644]
drivers/i2c/busses/i2c-prosavage.c
drivers/i2c/busses/i2c-savage4.c
drivers/i2c/busses/i2c-versatile.c [new file with mode: 0644]
drivers/i2c/busses/i2c-via.c
drivers/i2c/busses/i2c-voodoo3.c
drivers/i2c/busses/scx200_i2c.c
drivers/i2c/chips/ds1337.c
drivers/i2c/chips/tps65010.c
drivers/i2c/i2c-core.c
drivers/i2c/i2c-dev.c
drivers/ide/Kconfig
drivers/ide/ide-cd.c
drivers/ide/ide-floppy.c
drivers/ide/ide-probe.c
drivers/ide/ide-tape.c
drivers/ide/pci/hpt366.c
drivers/ide/pci/pdc202xx_new.c
drivers/ide/pci/piix.c
drivers/ide/setup-pci.c
drivers/ieee1394/pcilynx.c
drivers/infiniband/core/Makefile
drivers/infiniband/core/cm.c
drivers/infiniband/core/cma.c
drivers/infiniband/core/fmr_pool.c
drivers/infiniband/core/mad.c
drivers/infiniband/core/mad_priv.h
drivers/infiniband/core/ucma.c [new file with mode: 0644]
drivers/infiniband/core/uverbs_marshall.c
drivers/infiniband/core/uverbs_mem.c
drivers/infiniband/hw/amso1100/c2_qp.c
drivers/infiniband/hw/ipath/Makefile
drivers/infiniband/hw/ipath/ipath_dma.c [new file with mode: 0644]
drivers/infiniband/hw/ipath/ipath_driver.c
drivers/infiniband/hw/ipath/ipath_file_ops.c
drivers/infiniband/hw/ipath/ipath_iba6110.c
drivers/infiniband/hw/ipath/ipath_iba6120.c
drivers/infiniband/hw/ipath/ipath_init_chip.c
drivers/infiniband/hw/ipath/ipath_intr.c
drivers/infiniband/hw/ipath/ipath_keys.c
drivers/infiniband/hw/ipath/ipath_mr.c
drivers/infiniband/hw/ipath/ipath_sysfs.c
drivers/infiniband/hw/ipath/ipath_verbs.c
drivers/infiniband/hw/ipath/ipath_verbs.h
drivers/infiniband/ulp/ipoib/ipoib.h
drivers/infiniband/ulp/ipoib/ipoib_ib.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/infiniband/ulp/iser/iscsi_iser.h
drivers/infiniband/ulp/iser/iser_initiator.c
drivers/infiniband/ulp/iser/iser_memory.c
drivers/infiniband/ulp/srp/ib_srp.c
drivers/infiniband/ulp/srp/ib_srp.h
drivers/input/keyboard/hilkbd.c
drivers/input/touchscreen/Kconfig
drivers/isdn/act2000/act2000_isa.c
drivers/isdn/capi/capidrv.c
drivers/isdn/divert/divert_procfs.c
drivers/isdn/divert/isdn_divert.c
drivers/isdn/gigaset/bas-gigaset.c
drivers/isdn/hisax/Kconfig
drivers/isdn/hysdn/hysdn_procconf.c
drivers/isdn/hysdn/hysdn_proclog.c
drivers/isdn/i4l/isdn_audio.c
drivers/isdn/i4l/isdn_net.c
drivers/isdn/i4l/isdn_ppp.c
drivers/isdn/pcbit/layer2.c
drivers/kvm/Kconfig [new file with mode: 0644]
drivers/kvm/Makefile [new file with mode: 0644]
drivers/kvm/kvm.h [new file with mode: 0644]
drivers/kvm/kvm_main.c [new file with mode: 0644]
drivers/kvm/kvm_svm.h [new file with mode: 0644]
drivers/kvm/kvm_vmx.h [new file with mode: 0644]
drivers/kvm/mmu.c [new file with mode: 0644]
drivers/kvm/paging_tmpl.h [new file with mode: 0644]
drivers/kvm/segment_descriptor.h [new file with mode: 0644]
drivers/kvm/svm.c [new file with mode: 0644]
drivers/kvm/svm.h [new file with mode: 0644]
drivers/kvm/vmx.c [new file with mode: 0644]
drivers/kvm/vmx.h [new file with mode: 0644]
drivers/kvm/x86_emulate.c [new file with mode: 0644]
drivers/kvm/x86_emulate.h [new file with mode: 0644]
drivers/leds/Kconfig
drivers/macintosh/adb.c
drivers/macintosh/apm_emu.c
drivers/macintosh/smu.c
drivers/macintosh/via-pmu68k.c
drivers/md/Kconfig
drivers/md/faulty.c
drivers/md/md.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
drivers/media/Kconfig
drivers/media/common/ir-keymaps.c
drivers/media/common/saa7146_i2c.c
drivers/media/dvb/b2c2/Kconfig
drivers/media/dvb/b2c2/flexcop-fe-tuner.c
drivers/media/dvb/bt8xx/Kconfig
drivers/media/dvb/bt8xx/dst_ca.c
drivers/media/dvb/bt8xx/dvb-bt8xx.c
drivers/media/dvb/bt8xx/dvb-bt8xx.h
drivers/media/dvb/cinergyT2/cinergyT2.c
drivers/media/dvb/dvb-usb/Kconfig
drivers/media/dvb/dvb-usb/Makefile
drivers/media/dvb/dvb-usb/a800.c
drivers/media/dvb/dvb-usb/cxusb.c
drivers/media/dvb/dvb-usb/dib0700.h
drivers/media/dvb/dvb-usb/dib0700_core.c
drivers/media/dvb/dvb-usb/dib0700_devices.c
drivers/media/dvb/dvb-usb/dibusb-mb.c
drivers/media/dvb/dvb-usb/dibusb-mc.c
drivers/media/dvb/dvb-usb/digitv.c
drivers/media/dvb/dvb-usb/dtt200u.c
drivers/media/dvb/dvb-usb/dvb-usb-ids.h
drivers/media/dvb/dvb-usb/dvb-usb-remote.c
drivers/media/dvb/dvb-usb/gp8psk.c
drivers/media/dvb/dvb-usb/nova-t-usb2.c
drivers/media/dvb/dvb-usb/ttusb2.c [new file with mode: 0644]
drivers/media/dvb/dvb-usb/ttusb2.h [new file with mode: 0644]
drivers/media/dvb/dvb-usb/umt-010.c
drivers/media/dvb/dvb-usb/vp702x.c
drivers/media/dvb/dvb-usb/vp7045.c
drivers/media/dvb/frontends/Kconfig
drivers/media/dvb/frontends/Makefile
drivers/media/dvb/frontends/dib3000mc.c
drivers/media/dvb/frontends/dib7000m.c [new file with mode: 0644]
drivers/media/dvb/frontends/dib7000m.h [new file with mode: 0644]
drivers/media/dvb/frontends/dib7000p.c [new file with mode: 0644]
drivers/media/dvb/frontends/dib7000p.h [new file with mode: 0644]
drivers/media/dvb/frontends/dibx000_common.h
drivers/media/dvb/frontends/dvb-pll.c
drivers/media/dvb/frontends/dvb-pll.h
drivers/media/dvb/frontends/lg_h06xf.h [deleted file]
drivers/media/dvb/frontends/lgdt330x.c
drivers/media/dvb/frontends/lgdt330x_priv.h
drivers/media/dvb/frontends/lgh06xf.c [new file with mode: 0644]
drivers/media/dvb/frontends/lgh06xf.h [new file with mode: 0644]
drivers/media/dvb/frontends/or51132.c
drivers/media/dvb/frontends/or51211.c
drivers/media/dvb/frontends/tda1004x.c
drivers/media/dvb/frontends/tda1004x.h
drivers/media/dvb/frontends/tda8083.c
drivers/media/dvb/frontends/tda826x.c
drivers/media/dvb/frontends/tua6100.c
drivers/media/dvb/pluto2/pluto2.c
drivers/media/dvb/ttpci/Kconfig
drivers/media/dvb/ttpci/av7110.c
drivers/media/dvb/ttpci/av7110_ir.c
drivers/media/dvb/ttpci/budget-av.c
drivers/media/dvb/ttpci/budget-ci.c
drivers/media/dvb/ttpci/budget.c
drivers/media/dvb/ttusb-dec/ttusb_dec.c
drivers/media/dvb/ttusb-dec/ttusbdecfe.c
drivers/media/video/Kconfig
drivers/media/video/Makefile
drivers/media/video/bt8xx/bttv-driver.c
drivers/media/video/bt8xx/bttv-i2c.c
drivers/media/video/bt8xx/bttv-input.c
drivers/media/video/cafe_ccic-regs.h [new file with mode: 0644]
drivers/media/video/cafe_ccic.c [new file with mode: 0644]
drivers/media/video/cx88/Kconfig
drivers/media/video/cx88/cx88-blackbird.c
drivers/media/video/cx88/cx88-cards.c
drivers/media/video/cx88/cx88-core.c
drivers/media/video/cx88/cx88-dvb.c
drivers/media/video/cx88/cx88-input.c
drivers/media/video/cx88/cx88-mpeg.c
drivers/media/video/cx88/cx88-tvaudio.c
drivers/media/video/cx88/cx88-video.c
drivers/media/video/cx88/cx88-vp3054-i2c.c
drivers/media/video/cx88/cx88.h
drivers/media/video/dabusb.c
drivers/media/video/ir-kbd-i2c.c
drivers/media/video/mxb.c
drivers/media/video/ov7670.c [new file with mode: 0644]
drivers/media/video/planb.c
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
drivers/media/video/pvrusb2/pvrusb2-hdw.c
drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
drivers/media/video/saa7115.c
drivers/media/video/saa7134/saa7134-alsa.c
drivers/media/video/saa7134/saa7134-cards.c
drivers/media/video/saa7134/saa7134-core.c
drivers/media/video/saa7134/saa7134-dvb.c
drivers/media/video/saa7134/saa7134-i2c.c
drivers/media/video/saa7134/saa7134-input.c
drivers/media/video/saa7134/saa7134.h
drivers/media/video/stv680.c
drivers/media/video/tda9887.c
drivers/media/video/tuner-core.c
drivers/media/video/tuner-simple.c
drivers/media/video/tuner-types.c
drivers/media/video/tveeprom.c
drivers/media/video/usbvideo/quickcam_messenger.c
drivers/media/video/usbvideo/usbvideo.c
drivers/media/video/usbvision/Kconfig [new file with mode: 0644]
drivers/media/video/usbvision/Makefile [new file with mode: 0644]
drivers/media/video/usbvision/usbvision-cards.c [new file with mode: 0644]
drivers/media/video/usbvision/usbvision-core.c [new file with mode: 0644]
drivers/media/video/usbvision/usbvision-i2c.c [new file with mode: 0644]
drivers/media/video/usbvision/usbvision-video.c [new file with mode: 0644]
drivers/media/video/usbvision/usbvision.h [new file with mode: 0644]
drivers/media/video/v4l1-compat.c
drivers/media/video/v4l2-common.c
drivers/media/video/videocodec.c
drivers/media/video/videodev.c
drivers/media/video/vino.c
drivers/media/video/vivi.c
drivers/media/video/zoran_card.c
drivers/media/video/zr36120.c [deleted file]
drivers/media/video/zr36120.h [deleted file]
drivers/media/video/zr36120_i2c.c [deleted file]
drivers/media/video/zr36120_mem.c [deleted file]
drivers/media/video/zr36120_mem.h [deleted file]
drivers/message/i2o/core.h
drivers/message/i2o/driver.c
drivers/message/i2o/exec-osm.c
drivers/message/i2o/i2o_config.c
drivers/mmc/at91_mci.c
drivers/mmc/mmc_queue.c
drivers/mmc/sdhci.c
drivers/mtd/devices/mtd_dataflash.c
drivers/mtd/rfd_ftl.c
drivers/net/8139too.c
drivers/net/Kconfig
drivers/net/appletalk/ipddp.c
drivers/net/bsd_comp.c
drivers/net/chelsio/cxgb2.c
drivers/net/chelsio/sge.c
drivers/net/chelsio/sge.h
drivers/net/e100.c
drivers/net/hamradio/baycom_epp.c
drivers/net/irda/donauboe.c
drivers/net/irda/irda-usb.c
drivers/net/irda/irport.c
drivers/net/lp486e.c
drivers/net/macb.c
drivers/net/macb.h
drivers/net/myri10ge/myri10ge.c
drivers/net/phy/phy_device.c
drivers/net/ppp_deflate.c
drivers/net/ppp_mppe.c
drivers/net/skge.c
drivers/net/slip.c
drivers/net/smc91x.h
drivers/net/ucc_geth.c
drivers/net/wan/Kconfig
drivers/net/wan/hostess_sv11.c
drivers/net/wan/pc300_drv.c
drivers/net/wan/pc300_tty.c
drivers/net/wan/x25_asy.c
drivers/net/wireless/hostap/hostap_ap.c
drivers/net/wireless/hostap/hostap_download.c
drivers/net/wireless/hostap/hostap_hw.c
drivers/net/wireless/hostap/hostap_ioctl.c
drivers/net/wireless/hostap/hostap_main.c
drivers/net/wireless/ipw2100.c
drivers/net/wireless/prism54/isl_ioctl.c
drivers/net/wireless/wavelan_cs.c
drivers/net/wireless/zd1211rw/zd_chip.c
drivers/parisc/iosapic.c
drivers/parport/Kconfig
drivers/pci/hotplug/Kconfig
drivers/pci/hotplug/cpqphp_nvram.c
drivers/pci/hotplug/pciehp_hpc.c
drivers/pci/pcie/aer/aerdrv.c
drivers/pcmcia/at91_cf.c
drivers/pcmcia/omap_cf.c
drivers/pnp/isapnp/core.c
drivers/pnp/pnpacpi/core.c
drivers/pnp/pnpacpi/rsparser.c
drivers/pnp/pnpbios/core.c
drivers/pnp/pnpbios/proc.c
drivers/pnp/pnpbios/rsparser.c
drivers/ps3/Makefile
drivers/ps3/vuart.c [new file with mode: 0644]
drivers/ps3/vuart.h [new file with mode: 0644]
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/rtc/rtc-at91rm9200.c [moved from drivers/rtc/rtc-at91.c with 99% similarity]
drivers/rtc/rtc-dev.c
drivers/rtc/rtc-ds1672.c
drivers/rtc/rtc-lib.c
drivers/rtc/rtc-omap.c
drivers/rtc/rtc-pcf8563.c
drivers/rtc/rtc-proc.c
drivers/rtc/rtc-rs5c372.c
drivers/rtc/rtc-s3c.c
drivers/rtc/rtc-sa1100.c
drivers/rtc/rtc-sh.c
drivers/rtc/rtc-sysfs.c
drivers/rtc/rtc-x1205.c
drivers/s390/char/con3215.c
drivers/s390/char/keyboard.c
drivers/s390/char/sclp_cpi.c
drivers/s390/crypto/zcrypt_cex2a.c
drivers/s390/crypto/zcrypt_pcica.c
drivers/s390/crypto/zcrypt_pcixcc.c
drivers/s390/net/ctcmain.c
drivers/s390/net/iucv.c
drivers/s390/scsi/zfcp_aux.c
drivers/sbus/char/vfc_dev.c
drivers/scsi/aacraid/aachba.c
drivers/scsi/aacraid/comminit.c
drivers/scsi/aha1542.c
drivers/scsi/aic7xxx_old.c
drivers/scsi/dc395x.c
drivers/scsi/dpt_i2o.c
drivers/scsi/initio.c
drivers/scsi/osst.c
drivers/scsi/pluto.c
drivers/scsi/sr_ioctl.c
drivers/scsi/sr_vendor.c
drivers/scsi/sym53c8xx_2/sym_hipd.c
drivers/serial/Kconfig
drivers/serial/icom.c
drivers/serial/sh-sci.c
drivers/serial/sh-sci.h
drivers/spi/pxa2xx_spi.c
drivers/usb/gadget/at91_udc.c
drivers/usb/gadget/serial.c
drivers/usb/host/hc_crisv10.c
drivers/usb/misc/auerswald.c
drivers/usb/misc/uss720.c
drivers/usb/net/rndis_host.c
drivers/usb/serial/cypress_m8.c
drivers/usb/serial/digi_acceleport.c
drivers/usb/serial/io_ti.c
drivers/usb/serial/ipaq.c
drivers/usb/serial/kobil_sct.c
drivers/usb/serial/pl2303.c
drivers/usb/serial/ti_usb_3410_5052.c
drivers/usb/serial/whiteheat.c
drivers/usb/storage/sddr09.c
drivers/video/Kconfig
drivers/video/Makefile
drivers/video/amba-clcd.c
drivers/video/amifb.c
drivers/video/aty/atyfb_base.c
drivers/video/aty/radeon_i2c.c
drivers/video/gxt4500.c [new file with mode: 0644]
drivers/video/i810/i810-i2c.c
drivers/video/intelfb/intelfb_i2c.c
drivers/video/matrox/i2c-matroxfb.c
drivers/video/matrox/matroxfb_base.c
drivers/video/matrox/matroxfb_crtc2.c
drivers/video/nvidia/nv_i2c.c
drivers/video/riva/rivafb-i2c.c
drivers/video/savage/savagefb-i2c.c
drivers/video/sstfb.c
drivers/w1/slaves/Kconfig
fs/Kconfig
fs/aio.c
fs/autofs4/inode.c
fs/befs/btree.c
fs/befs/debug.c
fs/bfs/inode.c
fs/binfmt_elf_fdpic.c
fs/binfmt_misc.c
fs/bio.c
fs/block_dev.c
fs/buffer.c
fs/cifs/cifssmb.c
fs/cifs/file.c
fs/compat.c
fs/direct-io.c
fs/exec.c
fs/fcntl.c
fs/file.c
fs/inode.c
fs/jbd/transaction.c
fs/jffs/inode-v23.c
fs/jffs/intrep.c
fs/jfs/jfs_dtree.c
fs/jfs/jfs_filsys.h
fs/jfs/jfs_imap.c
fs/lockd/clntlock.c
fs/lockd/clntproc.c
fs/lockd/svclock.c
fs/lockd/svcshare.c
fs/lockd/xdr.c
fs/lockd/xdr4.c
fs/namespace.c
fs/ncpfs/inode.c
fs/nfs/nfs4proc.c
fs/nfsd/export.c
fs/nfsd/lockd.c
fs/nfsd/nfs4proc.c
fs/nfsd/nfs4state.c
fs/nfsd/nfs4xdr.c
fs/nfsd/nfsfh.c
fs/nfsd/vfs.c
fs/ocfs2/alloc.c
fs/ocfs2/cluster/heartbeat.c
fs/ocfs2/cluster/nodemanager.c
fs/ocfs2/cluster/nodemanager.h
fs/ocfs2/cluster/tcp.c
fs/ocfs2/cluster/tcp.h
fs/ocfs2/cluster/tcp_internal.h
fs/ocfs2/dlm/dlmdomain.c
fs/ocfs2/dlm/dlmlock.c
fs/ocfs2/dlm/dlmmaster.c
fs/ocfs2/dlm/dlmrecovery.c
fs/ocfs2/dlmglue.c
fs/ocfs2/file.c
fs/ocfs2/heartbeat.c
fs/ocfs2/inode.c
fs/ocfs2/journal.c
fs/ocfs2/journal.h
fs/ocfs2/localalloc.c
fs/ocfs2/mmap.c
fs/ocfs2/namei.c
fs/ocfs2/ocfs2.h
fs/ocfs2/ocfs2_fs.h
fs/ocfs2/slot_map.c
fs/ocfs2/suballoc.c
fs/ocfs2/super.c
fs/ocfs2/vote.c
fs/open.c
fs/pipe.c
fs/proc/base.c
fs/proc/proc_misc.c
fs/read_write.c
fs/reiserfs/xattr_acl.c
fs/select.c
fs/smbfs/inode.c
fs/smbfs/proc.c
fs/smbfs/smbiod.c
fs/splice.c
fs/xfs/linux-2.6/xfs_aops.c
include/asm-arm/arch-pnx4008/i2c.h [new file with mode: 0644]
include/asm-arm/arch-pxa/pxa2xx_spi.h
include/asm-arm/thread_info.h
include/asm-avr32/arch-at32ap/at32ap7000.h [new file with mode: 0644]
include/asm-avr32/arch-at32ap/board.h
include/asm-avr32/arch-at32ap/portmux.h
include/asm-avr32/dma-mapping.h
include/asm-avr32/pgalloc.h
include/asm-frv/thread_info.h
include/asm-generic/vmlinux.lds.h
include/asm-i386/msr.h
include/asm-i386/thread_info.h
include/asm-i386/topology.h
include/asm-ia64/break.h
include/asm-ia64/kprobes.h
include/asm-ia64/sn/xpc.h
include/asm-ia64/thread_info.h
include/asm-ia64/topology.h
include/asm-m68k/swim_iop.h [deleted file]
include/asm-mips/compat.h
include/asm-mips/mach-ip27/irq.h
include/asm-mips/mach-ip27/topology.h
include/asm-mips/pci.h
include/asm-mips/ptrace.h
include/asm-mips/sn/arch.h
include/asm-mips/sn/klconfig.h
include/asm-mips/system.h
include/asm-powerpc/Kbuild
include/asm-powerpc/bitops.h
include/asm-powerpc/bug.h
include/asm-powerpc/cputable.h
include/asm-powerpc/dcr-native.h
include/asm-powerpc/dcr.h
include/asm-powerpc/hw_irq.h
include/asm-powerpc/module.h
include/asm-powerpc/pci-bridge.h
include/asm-powerpc/pci.h
include/asm-powerpc/reg.h
include/asm-powerpc/rtas.h
include/asm-powerpc/thread_info.h
include/asm-powerpc/topology.h
include/asm-ppc/pci-bridge.h
include/asm-ppc/pci.h
include/asm-ppc/reg_booke.h
include/asm-sh/atomic-irq.h [new file with mode: 0644]
include/asm-sh/atomic-llsc.h [new file with mode: 0644]
include/asm-sh/atomic.h
include/asm-sh/bug.h
include/asm-sh/bugs.h
include/asm-sh/checksum.h
include/asm-sh/cpu-sh4/cache.h
include/asm-sh/cpu-sh4/freq.h
include/asm-sh/dma-mapping.h
include/asm-sh/irq.h
include/asm-sh/pgtable.h
include/asm-sh/processor.h
include/asm-sh/push-switch.h
include/asm-sh/thread_info.h
include/asm-sh64/pgalloc.h
include/asm-sparc64/dma.h
include/asm-sparc64/irqflags.h [new file with mode: 0644]
include/asm-sparc64/kprobes.h
include/asm-sparc64/rwsem.h
include/asm-sparc64/system.h
include/asm-sparc64/ttable.h
include/asm-x86_64/msr.h
include/asm-x86_64/thread_info.h
include/asm-x86_64/topology.h
include/asm-xtensa/asmmacro.h [new file with mode: 0644]
include/asm-xtensa/bug.h
include/asm-xtensa/byteorder.h
include/asm-xtensa/cache.h
include/asm-xtensa/cacheasm.h [new file with mode: 0644]
include/asm-xtensa/cacheflush.h
include/asm-xtensa/checksum.h
include/asm-xtensa/coprocessor.h
include/asm-xtensa/dma.h
include/asm-xtensa/elf.h
include/asm-xtensa/fcntl.h
include/asm-xtensa/fixmap.h [deleted file]
include/asm-xtensa/io.h
include/asm-xtensa/irq.h
include/asm-xtensa/irq_regs.h [new file with mode: 0644]
include/asm-xtensa/mmu_context.h
include/asm-xtensa/page.h
include/asm-xtensa/param.h
include/asm-xtensa/pgtable.h
include/asm-xtensa/platform-iss/hardware.h
include/asm-xtensa/platform-iss/simcall.h [new file with mode: 0644]
include/asm-xtensa/posix_types.h
include/asm-xtensa/processor.h
include/asm-xtensa/ptrace.h
include/asm-xtensa/regs.h [new file with mode: 0644]
include/asm-xtensa/sembuf.h
include/asm-xtensa/shmbuf.h
include/asm-xtensa/stat.h
include/asm-xtensa/syscall.h [new file with mode: 0644]
include/asm-xtensa/system.h
include/asm-xtensa/termbits.h
include/asm-xtensa/timex.h
include/asm-xtensa/tlbflush.h
include/asm-xtensa/uaccess.h
include/asm-xtensa/unistd.h
include/asm-xtensa/variant-fsf/core.h [new file with mode: 0644]
include/asm-xtensa/variant-fsf/tie.h [new file with mode: 0644]
include/asm-xtensa/xtensa/cacheasm.h [deleted file]
include/asm-xtensa/xtensa/cacheattrasm.h [deleted file]
include/asm-xtensa/xtensa/config-linux_be/core.h [deleted file]
include/asm-xtensa/xtensa/config-linux_be/defs.h [deleted file]
include/asm-xtensa/xtensa/config-linux_be/specreg.h [deleted file]
include/asm-xtensa/xtensa/config-linux_be/system.h [deleted file]
include/asm-xtensa/xtensa/config-linux_be/tie.h [deleted file]
include/asm-xtensa/xtensa/coreasm.h [deleted file]
include/asm-xtensa/xtensa/corebits.h [deleted file]
include/asm-xtensa/xtensa/hal.h [deleted file]
include/asm-xtensa/xtensa/simcall.h [deleted file]
include/asm-xtensa/xtensa/xt2000-uart.h [deleted file]
include/asm-xtensa/xtensa/xt2000.h [deleted file]
include/asm-xtensa/xtensa/xtboard.h [deleted file]
include/linux/Kbuild
include/linux/aio.h
include/linux/bio.h
include/linux/blkdev.h
include/linux/clocksource.h
include/linux/coda_linux.h
include/linux/compiler.h
include/linux/configfs.h
include/linux/cpufreq.h
include/linux/cpuset.h
include/linux/dccp.h
include/linux/fb.h
include/linux/file.h
include/linux/freezer.h
include/linux/fs.h
include/linux/fsl_devices.h
include/linux/futex.h
include/linux/gameport.h
include/linux/i2c-algo-bit.h
include/linux/i2c-algo-ite.h [deleted file]
include/linux/i2c-algo-pca.h
include/linux/i2c-algo-pcf.h
include/linux/i2c-algo-sgi.h
include/linux/i2c-id.h
include/linux/i2c-pnx.h [new file with mode: 0644]
include/linux/i2c.h
include/linux/ide.h
include/linux/init.h
include/linux/init_task.h
include/linux/interrupt.h
include/linux/kernel.h
include/linux/kvm.h [new file with mode: 0644]
include/linux/lockd/bind.h
include/linux/lockd/lockd.h
include/linux/lockd/sm_inter.h
include/linux/lockd/xdr.h
include/linux/lockdep.h
include/linux/mount.h
include/linux/n_r3964.h
include/linux/ncp_mount.h
include/linux/nfsd/nfsd.h
include/linux/nfsd/state.h
include/linux/nfsd/xdr4.h
include/linux/nsproxy.h
include/linux/pipe_fs_i.h
include/linux/raid/raid5.h
include/linux/reciprocal_div.h [new file with mode: 0644]
include/linux/rtc.h
include/linux/sched.h
include/linux/seqlock.h
include/linux/slab.h
include/linux/slab_def.h [new file with mode: 0644]
include/linux/smb_fs_sb.h
include/linux/sysctl.h
include/linux/sysrq.h
include/linux/task_io_accounting.h [new file with mode: 0644]
include/linux/task_io_accounting_ops.h [new file with mode: 0644]
include/linux/taskstats.h
include/linux/tfrc.h
include/linux/timer.h
include/linux/topology.h
include/linux/videodev2.h
include/media/ir-common.h
include/media/saa7146.h
include/media/tuner-types.h
include/media/tuner.h
include/media/tveeprom.h
include/media/v4l2-common.h
include/media/v4l2-dev.h
include/net/ax25.h
include/net/bluetooth/hci.h
include/net/ip.h
include/net/sctp/sctp.h
include/rdma/ib_marshall.h
include/rdma/ib_verbs.h
include/rdma/rdma_cm.h
include/rdma/rdma_cm_ib.h
include/rdma/rdma_user_cm.h [new file with mode: 0644]
include/video/sstfb.h
init/Kconfig
init/initramfs.c
init/main.c
init/version.c
ipc/msgutil.c
kernel/cpuset.c
kernel/exit.c
kernel/fork.c
kernel/lockdep.c
kernel/nsproxy.c
kernel/power/process.c
kernel/relay.c
kernel/sched.c
kernel/signal.c
kernel/sysctl.c
kernel/time/clocksource.c
kernel/timer.c
kernel/tsacct.c
lib/Kconfig
lib/Kconfig.debug
lib/Makefile
lib/bitrev.c
lib/ioremap.c
lib/reciprocal_div.c [new file with mode: 0644]
mm/filemap.c
mm/hugetlb.c
mm/memory.c
mm/oom_kill.c
mm/page-writeback.c
mm/page_alloc.c
mm/readahead.c
mm/slab.c
mm/slob.c
mm/truncate.c
mm/vmscan.c
net/ax25/ax25_addr.c
net/bluetooth/hci_sock.c
net/core/netpoll.c
net/dccp/ackvec.c
net/dccp/ccid.h
net/dccp/ccids/ccid2.c
net/dccp/ccids/ccid3.c
net/dccp/ccids/ccid3.h
net/dccp/ccids/lib/packet_history.c
net/dccp/ccids/lib/packet_history.h
net/dccp/ccids/lib/tfrc.h
net/dccp/ccids/lib/tfrc_equation.c
net/dccp/dccp.h
net/dccp/feat.c
net/dccp/input.c
net/dccp/ipv4.c
net/dccp/ipv6.c
net/dccp/minisocks.c
net/dccp/options.c
net/dccp/output.c
net/dccp/proto.c
net/dccp/timer.c
net/decnet/dn_dev.c
net/decnet/sysctl_net_decnet.c
net/ieee80211/softmac/ieee80211softmac_assoc.c
net/ipv4/devinet.c
net/ipv4/ip_fragment.c
net/ipv4/ipvs/ip_vs_sync.c
net/ipv4/route.c
net/ipv4/sysctl_net_ipv4.c
net/ipv6/addrconf.c
net/ipv6/ndisc.c
net/sunrpc/auth_gss/svcauth_gss.c
net/sunrpc/cache.c
net/sunrpc/svc.c
net/sunrpc/svcauth_unix.c
net/tipc/config.c
scripts/Kbuild.include
scripts/kconfig/conf.c
scripts/kconfig/confdata.c
scripts/kconfig/gconf.c
scripts/kconfig/gconf.glade
scripts/kconfig/lkc.h
scripts/kconfig/lkc_proto.h
scripts/kconfig/mconf.c
scripts/kconfig/qconf.cc
scripts/kconfig/qconf.h
scripts/kconfig/symbol.c
scripts/kconfig/zconf.tab.c_shipped
scripts/kconfig/zconf.y
scripts/mod/modpost.c
security/selinux/hooks.c
sound/Kconfig
sound/Makefile
sound/ac97_bus.c [moved from sound/pci/ac97/ac97_bus.c with 100% similarity]
sound/aoa/fabrics/Kconfig
sound/core/oss/mixer_oss.c
sound/drivers/Kconfig
sound/oss/ad1848.c
sound/oss/cs4232.c
sound/oss/emu10k1/audio.c
sound/oss/emu10k1/cardmi.c
sound/oss/emu10k1/cardmo.c
sound/oss/emu10k1/midi.c
sound/oss/emu10k1/mixer.c
sound/oss/hal2.c
sound/oss/mpu401.c
sound/oss/opl3.c
sound/oss/sb_common.c
sound/oss/sb_midi.c
sound/oss/sb_mixer.c
sound/oss/v_midi.c
sound/oss/waveartist.c
sound/pci/ac97/Makefile

index 29c18966b0502c3489e1058bd361db50a6c07686..0ad6dcb5d45ffd0f9f7e5ae1d64044afa51b1b8b 100644 (file)
@@ -35,12 +35,37 @@ In short, 8-char indents make things easier to read, and have the added
 benefit of warning you when you're nesting your functions too deep.
 Heed that warning.
 
+The preferred way to ease multiple indentation levels in a switch statement is
+to align the "switch" and its subordinate "case" labels in the same column
+instead of "double-indenting" the "case" labels.  E.g.:
+
+       switch (suffix) {
+       case 'G':
+       case 'g':
+               mem <<= 30;
+               break;
+       case 'M':
+       case 'm':
+               mem <<= 20;
+               break;
+       case 'K':
+       case 'k':
+               mem <<= 10;
+               /* fall through */
+       default:
+               break;
+       }
+
+
 Don't put multiple statements on a single line unless you have
 something to hide:
 
        if (condition) do_this;
          do_something_everytime;
 
+Don't put multiple assignments on a single line either.  Kernel coding style
+is super simple.  Avoid tricky expressions.
+
 Outside of comments, documentation and except in Kconfig, spaces are never
 used for indentation, and the above example is deliberately broken.
 
@@ -69,7 +94,7 @@ void fun(int a, int b, int c)
                next_statement;
 }
 
-               Chapter 3: Placing Braces
+               Chapter 3: Placing Braces and Spaces
 
 The other issue that always comes up in C styling is the placement of
 braces.  Unlike the indent size, there are few technical reasons to
@@ -81,6 +106,20 @@ brace last on the line, and put the closing brace first, thusly:
                we do y
        }
 
+This applies to all non-function statement blocks (if, switch, for,
+while, do).  E.g.:
+
+       switch (action) {
+       case KOBJ_ADD:
+               return "add";
+       case KOBJ_REMOVE:
+               return "remove";
+       case KOBJ_CHANGE:
+               return "change";
+       default:
+               return NULL;
+       }
+
 However, there is one special case, namely functions: they have the
 opening brace at the beginning of the next line, thus:
 
@@ -121,6 +160,49 @@ supply of new-lines on your screen is not a renewable resource (think
 25-line terminal screens here), you have more empty lines to put
 comments on.
 
+               3.1:  Spaces
+
+Linux kernel style for use of spaces depends (mostly) on
+function-versus-keyword usage.  Use a space after (most) keywords.  The
+notable exceptions are sizeof, typeof, alignof, and __attribute__, which look
+somewhat like functions (and are usually used with parentheses in Linux,
+although they are not required in the language, as in: "sizeof info" after
+"struct fileinfo info;" is declared).
+
+So use a space after these keywords:
+       if, switch, case, for, do, while
+but not with sizeof, typeof, alignof, or __attribute__.  E.g.,
+       s = sizeof(struct file);
+
+Do not add spaces around (inside) parenthesized expressions.  This example is
+*bad*:
+
+       s = sizeof( struct file );
+
+When declaring pointer data or a function that returns a pointer type, the
+preferred use of '*' is adjacent to the data name or function name and not
+adjacent to the type name.  Examples:
+
+       char *linux_banner;
+       unsigned long long memparse(char *ptr, char **retptr);
+       char *match_strdup(substring_t *s);
+
+Use one space around (on each side of) most binary and ternary operators,
+such as any of these:
+
+       =  +  -  <  >  *  /  %  |  &  ^  <=  >=  ==  !=  ?  :
+
+but no space after unary operators:
+       &  *  +  -  ~  !  sizeof  typeof  alignof  __attribute__  defined
+
+no space before the postfix increment & decrement unary operators:
+       ++  --
+
+no space after the prefix increment & decrement unary operators:
+       ++  --
+
+and no space around the '.' and "->" structure member operators.
+
 
                Chapter 4: Naming
 
@@ -152,7 +234,7 @@ variable that is used to hold a temporary value.
 
 If you are afraid to mix up your local variable names, you have another
 problem, which is called the function-growth-hormone-imbalance syndrome.
-See next chapter.
+See chapter 6 (Functions).
 
 
                Chapter 5: Typedefs
@@ -258,6 +340,20 @@ generally easily keep track of about 7 different things, anything more
 and it gets confused.  You know you're brilliant, but maybe you'd like
 to understand what you did 2 weeks from now.
 
+In source files, separate functions with one blank line.  If the function is
+exported, the EXPORT* macro for it should follow immediately after the closing
+function brace line.  E.g.:
+
+int system_is_up(void)
+{
+       return system_state == SYSTEM_RUNNING;
+}
+EXPORT_SYMBOL(system_is_up);
+
+In function prototypes, include parameter names with their data types.
+Although this is not required by the C language, it is preferred in Linux
+because it is a simple way to add valuable information for the reader.
+
 
                Chapter 7: Centralized exiting of functions
 
@@ -306,16 +402,36 @@ time to explain badly written code.
 Generally, you want your comments to tell WHAT your code does, not HOW.
 Also, try to avoid putting comments inside a function body: if the
 function is so complex that you need to separately comment parts of it,
-you should probably go back to chapter 5 for a while.  You can make
+you should probably go back to chapter 6 for a while.  You can make
 small comments to note or warn about something particularly clever (or
 ugly), but try to avoid excess.  Instead, put the comments at the head
 of the function, telling people what it does, and possibly WHY it does
 it.
 
-When commenting the kernel API functions, please use the kerneldoc format.
+When commenting the kernel API functions, please use the kernel-doc format.
 See the files Documentation/kernel-doc-nano-HOWTO.txt and scripts/kernel-doc
 for details.
 
+Linux style for comments is the C89 "/* ... */" style.
+Don't use C99-style "// ..." comments.
+
+The preferred style for long (multi-line) comments is:
+
+       /*
+        * This is the preferred style for multi-line
+        * comments in the Linux kernel source code.
+        * Please use it consistently.
+        *
+        * Description:  A column of asterisks on the left side,
+        * with beginning and ending almost-blank lines.
+        */
+
+It's also important to comment data, whether they are basic types or derived
+types.  To this end, use just one data declaration per line (no commas for
+multiple data declarations).  This leaves you room for a small comment on each
+item, explaining its use.
+
+
                Chapter 9: You've made a mess of it
 
 That's OK, we all do.  You've probably been told by your long-time Unix
@@ -591,4 +707,4 @@ Kernel CodingStyle, by greg@kroah.com at OLS 2002:
 http://www.kroah.com/linux/talks/ols_2002_kernel_codingstyle_talk/html/
 
 --
-Last updated on 30 April 2006.
+Last updated on 2006-December-06.
index 7ac61f60037af81905aad58a39d70152f333eb82..2270efa101530f8f1de58e951d9c7b4a1f6969d0 100644 (file)
@@ -66,3 +66,9 @@ kernel patches.
     See Documentation/ABI/README for more information.
 
 20: Check that it all passes `make headers_check'.
+
+21: Has been checked with injection of at least slab and page-allocation
+    fauilures.  See Documentation/fault-injection/.
+
+    If the new code is substantial, addition of subsystem-specific fault
+    injection might be appropriate.
index bf2b0e2f87e1acb3baef885d5e5ffcffcccb6cea..e9126e794ed7c04c19c42fb318dd36295d8806da 100644 (file)
@@ -7,6 +7,8 @@
  * Copyright (C) Balbir Singh, IBM Corp. 2006
  * Copyright (c) Jay Lan, SGI. 2006
  *
+ * Compile with
+ *     gcc -I/usr/src/linux/include getdelays.c -o getdelays
  */
 
 #include <stdio.h>
 #define NLA_DATA(na)           ((void *)((char*)(na) + NLA_HDRLEN))
 #define NLA_PAYLOAD(len)       (len - NLA_HDRLEN)
 
-#define err(code, fmt, arg...) do { printf(fmt, ##arg); exit(code); } while (0)
-int done = 0;
-int rcvbufsz=0;
-
-    char name[100];
-int dbg=0, print_delays=0;
+#define err(code, fmt, arg...)                 \
+       do {                                    \
+               fprintf(stderr, fmt, ##arg);    \
+               exit(code);                     \
+       } while (0)
+
+int done;
+int rcvbufsz;
+char name[100];
+int dbg;
+int print_delays;
+int print_io_accounting;
 __u64 stime, utime;
+
 #define PRINTF(fmt, arg...) {                  \
            if (dbg) {                          \
                printf(fmt, ##arg);             \
@@ -78,8 +87,9 @@ static int create_nl_socket(int protocol)
        if (rcvbufsz)
                if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF,
                                &rcvbufsz, sizeof(rcvbufsz)) < 0) {
-                       printf("Unable to set socket rcv buf size to %d\n",
-                              rcvbufsz);
+                       fprintf(stderr, "Unable to set socket rcv buf size "
+                                       "to %d\n",
+                               rcvbufsz);
                        return -1;
                }
 
@@ -186,6 +196,15 @@ void print_delayacct(struct taskstats *t)
               "count", "delay total", t->swapin_count, t->swapin_delay_total);
 }
 
+void print_ioacct(struct taskstats *t)
+{
+       printf("%s: read=%llu, write=%llu, cancelled_write=%llu\n",
+               t->ac_comm,
+               (unsigned long long)t->read_bytes,
+               (unsigned long long)t->write_bytes,
+               (unsigned long long)t->cancelled_write_bytes);
+}
+
 int main(int argc, char *argv[])
 {
        int c, rc, rep_len, aggr_len, len2, cmd_type;
@@ -208,7 +227,7 @@ int main(int argc, char *argv[])
        struct msgtemplate msg;
 
        while (1) {
-               c = getopt(argc, argv, "dw:r:m:t:p:v:l");
+               c = getopt(argc, argv, "diw:r:m:t:p:v:l");
                if (c < 0)
                        break;
 
@@ -217,6 +236,10 @@ int main(int argc, char *argv[])
                        printf("print delayacct stats ON\n");
                        print_delays = 1;
                        break;
+               case 'i':
+                       printf("printing IO accounting\n");
+                       print_io_accounting = 1;
+                       break;
                case 'w':
                        strncpy(logfile, optarg, MAX_FILENAME);
                        printf("write to file %s\n", logfile);
@@ -238,14 +261,12 @@ int main(int argc, char *argv[])
                        if (!tid)
                                err(1, "Invalid tgid\n");
                        cmd_type = TASKSTATS_CMD_ATTR_TGID;
-                       print_delays = 1;
                        break;
                case 'p':
                        tid = atoi(optarg);
                        if (!tid)
                                err(1, "Invalid pid\n");
                        cmd_type = TASKSTATS_CMD_ATTR_PID;
-                       print_delays = 1;
                        break;
                case 'v':
                        printf("debug on\n");
@@ -277,7 +298,7 @@ int main(int argc, char *argv[])
        mypid = getpid();
        id = get_family_id(nl_sd);
        if (!id) {
-               printf("Error getting family id, errno %d", errno);
+               fprintf(stderr, "Error getting family id, errno %d\n", errno);
                goto err;
        }
        PRINTF("family id %d\n", id);
@@ -288,7 +309,7 @@ int main(int argc, char *argv[])
                              &cpumask, strlen(cpumask) + 1);
                PRINTF("Sent register cpumask, retval %d\n", rc);
                if (rc < 0) {
-                       printf("error sending register cpumask\n");
+                       fprintf(stderr, "error sending register cpumask\n");
                        goto err;
                }
        }
@@ -298,7 +319,7 @@ int main(int argc, char *argv[])
                              cmd_type, &tid, sizeof(__u32));
                PRINTF("Sent pid/tgid, retval %d\n", rc);
                if (rc < 0) {
-                       printf("error sending tid/tgid cmd\n");
+                       fprintf(stderr, "error sending tid/tgid cmd\n");
                        goto done;
                }
        }
@@ -310,13 +331,15 @@ int main(int argc, char *argv[])
                PRINTF("received %d bytes\n", rep_len);
 
                if (rep_len < 0) {
-                       printf("nonfatal reply error: errno %d\n", errno);
+                       fprintf(stderr, "nonfatal reply error: errno %d\n",
+                               errno);
                        continue;
                }
                if (msg.n.nlmsg_type == NLMSG_ERROR ||
                    !NLMSG_OK((&msg.n), rep_len)) {
                        struct nlmsgerr *err = NLMSG_DATA(&msg);
-                       printf("fatal reply error,  errno %d\n", err->error);
+                       fprintf(stderr, "fatal reply error,  errno %d\n",
+                               err->error);
                        goto done;
                }
 
@@ -356,6 +379,8 @@ int main(int argc, char *argv[])
                                                count++;
                                                if (print_delays)
                                                        print_delayacct((struct taskstats *) NLA_DATA(na));
+                                               if (print_io_accounting)
+                                                       print_ioacct((struct taskstats *) NLA_DATA(na));
                                                if (fd) {
                                                        if (write(fd, NLA_DATA(na), na->nla_len) < 0) {
                                                                err(1,"write error\n");
@@ -365,7 +390,9 @@ int main(int argc, char *argv[])
                                                        goto done;
                                                break;
                                        default:
-                                               printf("Unknown nested nla_type %d\n", na->nla_type);
+                                               fprintf(stderr, "Unknown nested"
+                                                       " nla_type %d\n",
+                                                       na->nla_type);
                                                break;
                                        }
                                        len2 += NLA_ALIGN(na->nla_len);
@@ -374,7 +401,8 @@ int main(int argc, char *argv[])
                                break;
 
                        default:
-                               printf("Unknown nla_type %d\n", na->nla_type);
+                               fprintf(stderr, "Unknown nla_type %d\n",
+                                       na->nla_type);
                                break;
                        }
                        na = (struct nlattr *) (GENLMSG_DATA(&msg) + len);
index 29b3f9ffc66cda69ee9481bb9e0e1271295376fb..ce0666e5103682a766caff09a4af75513c38f77f 100644 (file)
@@ -24,7 +24,7 @@ Contents:
 1. General Information
 =======================
 
-The CPUFreq core code is located in linux/kernel/cpufreq.c. This
+The CPUFreq core code is located in drivers/cpufreq/cpufreq.c. This
 cpufreq code offers a standardized interface for the CPUFreq
 architecture drivers (those pieces of code that do actual
 frequency transitions), as well as to "notifiers". These are device
index ca58e339d85fe2e1fa036e89719b40c462d3d0d6..cc09187a5db75652ad36d3f750ca87f4f3b6ebda 100644 (file)
@@ -22,10 +22,10 @@ o Frontends drivers:
    - ves1x93           : Alps BSRV2 (ves1893 demodulator) and dbox2 (ves1993)
    - cx24110           : Conexant HM1221/HM1811 (cx24110 or cx24106 demod, cx24108 PLL)
    - grundig_29504-491 : Grundig 29504-491 (Philips TDA8083 demodulator), tsa5522 PLL
-   - mt312             : Zarlink mt312 or Mitel vp310 demodulator, sl1935 or tsa5059 PLL
+   - mt312             : Zarlink mt312 or Mitel vp310 demodulator, sl1935 or tsa5059 PLLi, Technisat Sky2Pc with bios Rev. 2.3
    - stv0299           : Alps BSRU6 (tsa5059 PLL), LG TDQB-S00x (tsa5059 PLL),
                          LG TDQF-S001F (sl1935 PLL), Philips SU1278 (tua6100 PLL),
-                         Philips SU1278SH (tsa5059 PLL), Samsung TBMU24112IMB
+                         Philips SU1278SH (tsa5059 PLL), Samsung TBMU24112IMB, Technisat Sky2Pc with bios Rev. 2.6
   DVB-C:
    - ves1820           : various (ves1820 demodulator, sp5659c or spXXXX PLL)
    - at76c651          : Atmel AT76c651(B) with DAT7021 PLL
index e82c15de7d2718801f9e695c0dd62f29e7443475..040f437c421bc1bb410ce2253369fa5e1cd33e64 100644 (file)
@@ -207,17 +207,6 @@ Who:       Thomas Gleixner <tglx@linutronix.de>
 
 ---------------------------
 
-What:  i2c-ite and i2c-algo-ite drivers
-When:  September 2006
-Why:   These drivers never compiled since they were added to the kernel
-       tree 5 years ago. This feature removal can be reevaluated if
-       someone shows interest in the drivers, fixes them and takes over
-       maintenance.
-       http://marc.theaimsgroup.com/?l=linux-mips&m=115040510817448
-Who:   Jean Delvare <khali@linux-fr.org>
-
----------------------------
-
 What:  Bridge netfilter deferred IPv4/IPv6 output hook calling
 When:  January 2007
 Why:   The deferred output hooks are a layering violation causing unusual
@@ -261,3 +250,25 @@ Why:       The new layer 3 independant connection tracking replaces the old
 Who:   Patrick McHardy <kaber@trash.net>
 
 ---------------------------
+
+What:  ACPI hooks (X86_SPEEDSTEP_CENTRINO_ACPI) in speedstep-centrino driver
+When:  December 2006
+Why:   Speedstep-centrino driver with ACPI hooks and acpi-cpufreq driver are
+       functionally very much similar. They talk to ACPI in same way. Only
+       difference between them is the way they do frequency transitions.
+       One uses MSRs and the other one uses IO ports. Functionaliy of
+       speedstep_centrino with ACPI hooks is now merged into acpi-cpufreq.
+       That means one common driver will support all Intel Enhanced Speedstep
+       capable CPUs. That means less confusion over name of
+       speedstep-centrino driver (with that driver supposed to be used on
+       non-centrino platforms). That means less duplication of code and
+       less maintenance effort and no possibility of these two drivers
+       going out of sync.
+       Current users of speedstep_centrino with ACPI hooks are requested to
+       switch over to acpi-cpufreq driver. speedstep-centrino will continue
+       to work using older non-ACPI static table based scheme even after this
+       date.
+
+Who:   Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
+
+---------------------------
index d2841e0bcf0258cb9b06b0fec372bae14b0ff3ba..ea825e178e797b3b8af53d8d6d5fa2c1f1974a0d 100644 (file)
@@ -54,4 +54,4 @@ The first 4 bytes should be 0x1badface.
 If you have any patches, questions or suggestions regarding this BFS
 implementation please contact the author:
 
-Tigran A. Aivazian <tigran@veritas.com>
+Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
index af6defd10cb604fa4f0468ba6522ca30e57adda5..8ccf0c1b58ed0df9430d1d67b6f62f4c64564218 100644 (file)
@@ -54,3 +54,6 @@ errors=panic          Panic and halt the machine if an error occurs.
 intr           (*)     Allow signals to interrupt cluster operations.
 nointr                 Do not allow signals to interrupt cluster
                        operations.
+atime_quantum=60(*)    OCFS2 will not update atime unless this number
+                       of seconds has passed since the last update.
+                       Set to zero to always update atime.
index db294ee7455a447350382b35037bd9e61f874380..460dd6635fd26c916fb8cab16e46e6473aa3142d 100644 (file)
@@ -5,7 +5,7 @@ Supported adapters:
 
 Datasheets:
        AMD datasheet not yet available, but almost everything can be found
-       in publically available ACPI 2.0 specification, which the adapter 
+       in the publicly available ACPI 2.0 specification, which the adapter
        follows.
 
 Author: Vojtech Pavlik <vojtech@suse.cz>
index e46c2345824243b66d50f7efbc101699561300ea..3db69a086c41d466afa26dfc6132c82b304a57e7 100644 (file)
@@ -9,7 +9,10 @@ Supported adapters:
   * Intel 82801EB/ER (ICH5) (HW PEC supported, 32 byte buffer not supported)
   * Intel 6300ESB
   * Intel 82801FB/FR/FW/FRW (ICH6)
-  * Intel ICH7
+  * Intel 82801G (ICH7)
+  * Intel 631xESB/632xESB (ESB2)
+  * Intel 82801H (ICH8)
+  * Intel ICH9
     Datasheets: Publicly available at the Intel website
 
 Authors: 
index cd49c428a3ab7627a73ffd75a0b071e4a08ebb28..7f61fbc03f7f51e294054fbff4037dec5995e9fa 100644 (file)
@@ -10,11 +10,11 @@ Supported adapters:
   * nForce4 MCP51              10de:0264
   * nForce4 MCP55              10de:0368
 
-Datasheet: not publically available, but seems to be similar to the
+Datasheet: not publicly available, but seems to be similar to the
            AMD-8111 SMBus 2.0 adapter.
 
 Authors:
-       Hans-Frieder Vogt <hfvogt@arcor.de>, 
+       Hans-Frieder Vogt <hfvogt@gmx.net>,
        Thomas Leibold <thomas@plx.com>, 
         Patrick Dreker <patrick@dreker.de>
        
@@ -38,7 +38,7 @@ Notes
 -----
 
 The SMBus adapter in the nForce2 chipset seems to be very similar to the
-SMBus 2.0 adapter in the AMD-8111 southbridge. However, I could only get
+SMBus 2.0 adapter in the AMD-8111 south bridge. However, I could only get
 the driver to work with direct I/O access, which is different to the EC
 interface of the AMD-8111. Tested on Asus A7N8X. The ACPI DSDT table of the
 Asus A7N8X lists two SMBuses, both of which are supported by this driver.
diff --git a/Documentation/ioctl/ioctl-decoding.txt b/Documentation/ioctl/ioctl-decoding.txt
new file mode 100644 (file)
index 0000000..bfdf7f3
--- /dev/null
@@ -0,0 +1,24 @@
+To decode a hex IOCTL code:
+
+Most architecures use this generic format, but check
+include/ARCH/ioctl.h for specifics, e.g. powerpc
+uses 3 bits to encode read/write and 13 bits for size.
+
+ bits    meaning
+ 31-30 00 - no parameters: uses _IO macro
+       10 - read: _IOR
+       01 - write: _IOW
+       11 - read/write: _IOWR
+
+ 29-16 size of arguments
+
+ 15-8  ascii character supposedly
+       unique to each driver
+
+ 7-0   function #
+
+
+ So for example 0x82187201 is a read with arg length of 0x218,
+character 'r' function 1. Grepping the source reveals this is:
+
+#define VFAT_IOCTL_READDIR_BOTH         _IOR('r', 1, struct dirent [2])
index 125093c3ef76229296c171167c726c32d8e82b1a..536d5bfbdb8d390fa412d6e0b200ac980ecebecd 100644 (file)
@@ -29,7 +29,7 @@ them. A single configuration option is defined like this:
 
 config MODVERSIONS
        bool "Set version information on all module symbols"
-       depends MODULES
+       depends on MODULES
        help
          Usually, modules have to be recompiled whenever you switch to a new
          kernel.  ...
@@ -163,7 +163,7 @@ The position of a menu entry in the tree is determined in two ways. First
 it can be specified explicitly:
 
 menu "Network device support"
-       depends NET
+       depends on NET
 
 config NETDEVICES
        ...
@@ -188,10 +188,10 @@ config MODULES
 
 config MODVERSIONS
        bool "Set version information on all module symbols"
-       depends MODULES
+       depends on MODULES
 
 comment "module support disabled"
-       depends !MODULES
+       depends on !MODULES
 
 MODVERSIONS directly depends on MODULES, this means it's only visible if
 MODULES is different from 'n'. The comment on the other hand is always
index d8323b8893c3709170d3e79c09a975f6bac42864..ef69c75780bf4e5ca4650411033f8711b0771fd2 100644 (file)
@@ -1656,6 +1656,12 @@ and is between 256 and 4096 characters. It is defined in the file
        sym53c416=      [HW,SCSI]
                        See header of drivers/scsi/sym53c416.c.
 
+       sysrq_always_enabled
+                       [KNL]
+                       Ignore sysrq setting - this boot parameter will
+                       neutralize any effect of /proc/sys/kernel/sysrq.
+                       Useful for debugging.
+
        t128=           [HW,SCSI]
                        See header of drivers/scsi/t128.c.
 
index dda15886bcb51045ad5168dcafb8e0e5048c6301..387482e46c474ed49bcc31081c39528ad1fdbfa4 100644 (file)
@@ -19,7 +19,8 @@ for real time and multimedia traffic.
 
 It has a base protocol and pluggable congestion control IDs (CCIDs).
 
-It is at experimental RFC status and the homepage for DCCP as a protocol is at:
+It is at proposed standard RFC status and the homepage for DCCP as a protocol
+is at:
        http://www.read.cs.ucla.edu/dccp/
 
 Missing features
@@ -34,9 +35,6 @@ The known bugs are at:
 Socket options
 ==============
 
-DCCP_SOCKOPT_PACKET_SIZE is used for CCID3 to set default packet size for
-calculations.
-
 DCCP_SOCKOPT_SERVICE sets the service. The specification mandates use of
 service codes (RFC 4340, sec. 8.1.2); if this socket option is not set,
 the socket will fall back to 0 (which means that no meaningful service code
index a1e0ee20f595cc5cf6fb94d5fd4b7caf1430e7f2..f9717fe9bd85296c8ae892003f70f013262a5fb1 100644 (file)
@@ -102,7 +102,7 @@ struct pxa2xx_spi_chip {
        u8 tx_threshold;
        u8 rx_threshold;
        u8 dma_burst_size;
-       u32 timeout_microsecs;
+       u32 timeout;
        u8 enable_loopback;
        void (*cs_control)(u32 command);
 };
@@ -121,7 +121,7 @@ the PXA2xx "Developer Manual" sections on the DMA controller and SSP Controllers
 to determine the correct value. An SSP configured for byte-wide transfers would
 use a value of 8.
 
-The "pxa2xx_spi_chip.timeout_microsecs" fields is used to efficiently handle
+The "pxa2xx_spi_chip.timeout" fields is used to efficiently handle
 trailing bytes in the SSP receiver fifo.  The correct value for this field is
 dependent on the SPI bus speed ("spi_board_info.max_speed_hz") and the specific
 slave device.  Please note that the PXA2xx SSP 1 does not support trailing byte
@@ -162,18 +162,18 @@ static void cs8405a_cs_control(u32 command)
 }
 
 static struct pxa2xx_spi_chip cs8415a_chip_info = {
-       .tx_threshold = 12, /* SSP hardward FIFO threshold */
-       .rx_threshold = 4, /* SSP hardward FIFO threshold */
+       .tx_threshold = 8, /* SSP hardward FIFO threshold */
+       .rx_threshold = 8, /* SSP hardward FIFO threshold */
        .dma_burst_size = 8, /* Byte wide transfers used so 8 byte bursts */
-       .timeout_microsecs = 64, /* Wait at least 64usec to handle trailing */
+       .timeout = 235, /* See Intel documentation */
        .cs_control = cs8415a_cs_control, /* Use external chip select */
 };
 
 static struct pxa2xx_spi_chip cs8405a_chip_info = {
-       .tx_threshold = 12, /* SSP hardward FIFO threshold */
-       .rx_threshold = 4, /* SSP hardward FIFO threshold */
+       .tx_threshold = 8, /* SSP hardward FIFO threshold */
+       .rx_threshold = 8, /* SSP hardward FIFO threshold */
        .dma_burst_size = 8, /* Byte wide transfers used so 8 byte bursts */
-       .timeout_microsecs = 64, /* Wait at least 64usec to handle trailing */
+       .timeout = 235, /* See Intel documentation */
        .cs_control = cs8405a_cs_control, /* Use external chip select */
 };
 
index 8755b3e7b09e500446d99800e8abc90df96c2b85..62e32b49cec966006d66f8d8ef0e703d81b57c18 100644 (file)
@@ -43,7 +43,7 @@
  42 -> digitalnow DNTV Live! DVB-T Pro                     [1822:0025,1822:0019]
  43 -> KWorld/VStream XPert DVB-T with cx22702             [17de:08a1,12ab:2300]
  44 -> DViCO FusionHDTV DVB-T Dual Digital                 [18ac:db50,18ac:db54]
- 45 -> KWorld HardwareMpegTV XPert                         [17de:0840]
+ 45 -> KWorld HardwareMpegTV XPert                         [17de:0840,1421:0305]
  46 -> DViCO FusionHDTV DVB-T Hybrid                       [18ac:db40,18ac:db44]
  47 -> pcHDTV HD5500 HDTV                                  [7063:5500]
  48 -> Kworld MCE 200 Deluxe                               [17de:0841]
index 53ce6a39083c22036bd7b52678da54cbc4a27d20..f6201cc37ec5fb608418b2e8b0cf64aeb33911ad 100644 (file)
@@ -76,7 +76,7 @@
  75 -> AVerMedia AVerTVHD MCE A180              [1461:1044]
  76 -> SKNet MonsterTV Mobile                   [1131:4ee9]
  77 -> Pinnacle PCTV 40i/50i/110i (saa7133)     [11bd:002e]
- 78 -> ASUSTeK P7131 Dual                       [1043:4862]
+ 78 -> ASUSTeK P7131 Dual                       [1043:4862,1043:4876]
  79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)
  80 -> ASUS Digimatrix TV                       [1043:0210]
  81 -> Philips Tiger reference design           [1131:2018]
@@ -99,3 +99,8 @@
  98 -> Proteus Pro 2309                         [0919:2003]
  99 -> AVerMedia TV Hybrid A16AR                [1461:2c00]
 100 -> Asus Europa2 OEM                         [1043:4860]
+101 -> Pinnacle PCTV 310i                       [11bd:002f]
+102 -> Avermedia AVerTV Studio 507              [1461:9715]
+103 -> Compro Videomate DVB-T200A
+104 -> Hauppauge WinTV-HVR1110 DVB-T/Hybrid     [0070:6701]
+105 -> Terratec Cinergy HT PCMCIA               [153b:1172]
diff --git a/Documentation/video4linux/cafe_ccic b/Documentation/video4linux/cafe_ccic
new file mode 100644 (file)
index 0000000..8882102
--- /dev/null
@@ -0,0 +1,54 @@
+"cafe_ccic" is a driver for the Marvell 88ALP01 "cafe" CMOS camera
+controller.  This is the controller found in first-generation OLPC systems,
+and this driver was written with support from the OLPC project.
+
+Current status: the core driver works.  It can generate data in YUV422,
+RGB565, and RGB444 formats.  (Anybody looking at the code will see RGB32 as
+well, but that is a debugging aid which will be removed shortly).  VGA and
+QVGA modes work; CIF is there but the colors remain funky.  Only the OV7670
+sensor is known to work with this controller at this time.
+
+To try it out: either of these commands will work:
+
+     mplayer tv:// -tv driver=v4l2:width=640:height=480 -nosound
+     mplayer tv:// -tv driver=v4l2:width=640:height=480:outfmt=bgr16 -nosound
+
+The "xawtv" utility also works; gqcam does not, for unknown reasons.
+
+There are a few load-time options, most of which can be changed after
+loading via sysfs as well:
+
+ - alloc_bufs_at_load:  Normally, the driver will not allocate any DMA
+   buffers until the time comes to transfer data.  If this option is set,
+   then worst-case-sized buffers will be allocated at module load time.
+   This option nails down the memory for the life of the module, but
+   perhaps decreases the chances of an allocation failure later on.
+
+ - dma_buf_size: The size of DMA buffers to allocate.  Note that this
+   option is only consulted for load-time allocation; when buffers are
+   allocated at run time, they will be sized appropriately for the current
+   camera settings.
+
+ - n_dma_bufs: The controller can cycle through either two or three DMA
+   buffers.  Normally, the driver tries to use three buffers; on faster
+   systems, however, it will work well with only two.
+
+ - min_buffers: The minimum number of streaming I/O buffers that the driver
+   will consent to work with.  Default is one, but, on slower systems,
+   better behavior with mplayer can be achieved by setting to a higher
+   value (like six).
+
+ - max_buffers: The maximum number of streaming I/O buffers; default is
+   ten.  That number was carefully picked out of a hat and should not be
+   assumed to actually mean much of anything.
+
+ - flip: If this boolean parameter is set, the sensor will be instructed to
+   invert the video image.  Whether it makes sense is determined by how
+   your particular camera is mounted.
+
+Work is ongoing with this driver, stay tuned.
+
+jon
+
+Jonathan Corbet
+corbet@lwn.net
diff --git a/Documentation/video4linux/zr36120.txt b/Documentation/video4linux/zr36120.txt
deleted file mode 100644 (file)
index 1a1c2d0..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-Driver for Trust Computer Products Framegrabber, version 0.6.1
------- --- ----- -------- -------- ------------  ------- - - -
-
-- ZORAN ------------------------------------------------------
- Author: Pauline Middelink <middelin@polyware.nl>
-   Date: 18 September 1999
-Version: 0.6.1
-
-- Description ------------------------------------------------
-
-Video4Linux compatible driver for an unknown brand framegrabber
-(Sold in the Netherlands by TRUST Computer Products) and various
-other zoran zr36120 based framegrabbers.
-
-The card contains a ZR36120 Multimedia PCI Interface and a Philips
-SAA7110 Onechip Frontend videodecoder. There is also an DSP of
-which I have forgotten the number, since i will never get that thing
-to work without specs from the vendor itself.
-
-The SAA711x are capable of processing 6 different video inputs,
-CVBS1..6 and Y1+C1, Y2+C2, Y3+C3. All in 50/60Hz, NTSC, PAL or
-SECAM and delivering a YUV datastream.  On my card the input
-'CVBS-0' corresponds to channel CVBS2 and 'S-Video' to Y2+C2.
-
-I have some reports of other cards working with the mentioned
-chip sets. For a list of other working cards please have a look
-at the cards named in the tvcards struct in the beginning of
-zr36120.c
-
-After some testing, I discovered that the carddesigner messed up
-on the I2C interface. The Zoran chip includes 2 lines SDA and SCL
-which (s)he connected reversely. So we have to clock on the SDA
-and r/w data on the SCL pin. Life is fun... Each cardtype now has
-a bit which signifies if you have a card with the same deficiency.
-
-Oh, for the completeness of this story I must mention that my
-card delivers the VSYNC pulse of the SAA chip to GIRQ1, not
-GIRQ0 as some other cards have. This is also incorporated in
-the driver be clearing/setting the 'useirq1' bit in the tvcard
-description.
-
-Another problems of continuous capturing data with a Zoran chip
-is something nasty inside the chip. It effectively halves the
-fps we ought to get... Here is the scenario: capturing frames
-to memory is done in the so-called snapshot mode. In this mode
-the Zoran stops after capturing a frame worth of data and wait
-till the application set GRAB bit to indicate readiness for the
-next frame. After detecting a set bit, the chip neatly waits
-till the start of a frame, captures it and it goes back to off.
-Smart ppl will notice the problem here. Its the waiting on the
-_next_ frame each time we set the GRAB bit... Oh well, 12,5 fps
-is still plenty fast for me.
--- update 28/7/1999 --
-Don't believe a word I just said... Proof is the output
-of `streamer -t 300 -r 25 -f avi15 -o /dev/null`
-       ++--+-+-+-+-+-+-+-+-+-+-+-+-s+-+-+-+-+-+-+-+-+-+-+- 25/25
-       +-s+-+-+-+-+-+-+-+-+-+-+-+-+-s+-+-+-+-+-+-+-+-+-+-+- 25/25
-       +-s+-+-+-+-+-+-+-+-+-+-+-+-+-s+-+-+-+-+-+-+-+-+-+-+- 25/25
-       +-s+-+-+-+-+-+-+-+-+-+-+-+-+-s+-+-+-+-+-+-+-+-+-+-+- 25/25
-       +-s+-+-+-+-+-+-+-+-+-+-+-+-+-s+-+-+-+-+-+-+-+-+-+-+- 25/25
-       +-s+-+-+-+-+-+-+-+-+-+-+-+-+-s+-+-+-+-+-+-+-+-+-+-+- 25/25
-       +-s+-+-+-+-+-+-+-+-+-+-+-+-+-s+-+-+-+-+-+-+-+-+-+-+- 25/25
-       +-s+-+-+-+-+-+-+-+-+-+-+-+-+-s+-+-+-+-+-+-+-+-+-+-+- 25/25
-       +-s+-+-+-+-+-+-+-+-+-+-+-+-+-s+-+-+-+-+-+-+-+-+-+-+- 25/25
-       +-s+-+-+-+-+-+-+-+-+-+-+-+-+-s+-+-+-+-+-+-+-+-+-+-+- 25/25
-       +-s+-+-+-+-+-+-+-+-+-+-+-+-+-s+-+-+-+-+-+-+-+-+-+-+- 25/25
-       +-s+-+-+-+-+-+-+-+-+-+-+-+-+-s+-+-+-+-+-+-+-+-+-+-+-
-       syncer: done
-       writer: done
-(note the /dev/null is prudent here, my system is not able to
- grab /and/ write 25 fps to a file... gifts welcome :) )
-The technical reasoning follows: The zoran completed the last
-frame, the VSYNC goes low, and GRAB is cleared. The interrupt
-routine starts to work since its VSYNC driven, and again
-activates the GRAB bit. A few ms later the VSYNC (re-)rises and
-the zoran starts to work on a new and freshly broadcasted frame....
-
-For pointers I used the specs of both chips. Below are the URLs:
-  http://www.zoran.com/ftp/download/devices/pci/ZR36120/36120data.pdf
-  http://www-us.semiconductor.philips.com/acrobat/datasheets/SAA_7110_A_1.pdf
-Some alternatives for the Philips SAA 7110 datasheet are:
-  http://www.datasheetcatalog.com/datasheets_pdf/S/A/A/7/SAA7110.shtml
-  http://www.datasheetarchive.com/search.php?search=SAA7110&sType=part
-
-The documentation has very little on absolute numbers or timings
-needed for the various modes/resolutions, but there are other
-programs you can borrow those from.
-
------- Install --------------------------------------------
-Read the file called TODO.  Note its long list of limitations.
-
-Build a kernel with VIDEO4LINUX enabled. Activate the
-BT848 driver; we need this because we have need for the
-other modules (i2c and videodev) it enables.
-
-To install this software, extract it into a suitable directory.
-Examine the makefile and change anything you don't like.  Type "make".
-
-After making the modules check if you have the much needed
-/dev/video devices. If not, execute the following 4 lines:
-       mknod /dev/video c 81 0
-       mknod /dev/video1 c 81 1
-       mknod /dev/video2 c 81 2
-       mknod /dev/video3 c 81 3
-       mknod /dev/video4 c 81 4
-
-After making/checking the devices do:
-       modprobe i2c
-       modprobe videodev
-       modprobe saa7110        (optional)
-       modprobe saa7111        (optional)
-       modprobe tuner          (optional)
-       insmod zoran cardtype=<n>
-
-<n> is the cardtype of the card you have. The cardnumber can
-be found in the source of zr36120. Look for tvcards. If your
-card is not there, please try if any other card gives some
-response, and mail me if you got a working tvcard addition.
-
-PS. <TVCard editors behold!)
-    Don't forget to set video_input to the number of inputs
-    you defined in the video_mux part of the tvcard definition.
-    It's a common error to add a channel but not incrementing
-    video_input and getting angry with me/v4l/linux/linus :(
-
-You are now ready to test the framegrabber with your favorite
-video4linux compatible tool
-
------- Application ----------------------------------------
-
-This device works with all Video4Linux compatible applications,
-given the limitations in the TODO file.
-
------- API ------------------------------------------------
-
-This uses the V4L interface as of kernel release 2.1.116, and in
-fact has not been tested on any lower version.  There are a couple
-of minor differences due to the fact that the amount of data returned
-with each frame varies, and no doubt there are discrepancies due to my
-misunderstanding of the API.  I intend to convert this driver to the
-new V4L2 API when it has stabilized more.
-
------- Current state --------------------------------------
-
-The driver is capable of overlaying a video image in screen, and
-even capable of grabbing frames. It uses the BIGPHYSAREA patch
-to allocate lots of large memory blocks when tis patch is
-found in the kernel, but it doesn't need it.
-The consequence is that, when loading the driver as a module,
-the module may tell you it's out of memory, but 'free' says
-otherwise. The reason is simple; the modules wants its memory
-contiguous, not fragmented, and after a long uptime there
-probably isn't a fragment of memory large enough...
-
-The driver uses a double buffering scheme, which should really
-be an n-way buffer, depending on the size of allocated framebuffer
-and the requested grab-size/format.
-This current version also fixes a dead-lock situation during irq
-time, which really, really froze my system... :)
-
-Good luck.
-  Pauline
index 9c6aac33eb3bc39762707a937f4392302541a7e1..dea5b2a6de0a8becde3fdba5e0c48f7cfcd0917c 100644 (file)
@@ -747,7 +747,7 @@ P:  Dave Jones
 M:     davej@codemonkey.org.uk
 L:     cpufreq@lists.linux.org.uk
 W:     http://www.codemonkey.org.uk/projects/cpufreq/
-T:     git kernel.org/pub/scm/linux/kernel/davej/cpufreq.git
+T:     git kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
 S:     Maintained
 
 CPUID/MSR DRIVER
@@ -1511,8 +1511,10 @@ T:       git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
 S:     Maintained
 
 INOTIFY
-P:     John McCutchan and Robert Love
-M:     ttb@tentacle.dhs.org and rml@novell.com
+P:     John McCutchan
+M:     ttb@tentacle.dhs.org
+P:     Robert Love
+M:     rml@novell.com
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
@@ -1752,6 +1754,13 @@ W:       http://nfs.sourceforge.net/
 W:     http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/
 S:     Maintained
 
+KERNEL VIRTUAL MACHINE (KVM)
+P:     Avi Kivity
+M:     avi@qumranet.com
+L:     kvm-devel@lists.sourceforge.net
+W:     kvm.sourceforge.net
+S:     Supported
+
 KEXEC
 P:     Eric Biederman
 M:     ebiederm@xmission.com
@@ -2561,7 +2570,7 @@ S:        Maintained
 REAL TIME CLOCK (RTC) SUBSYSTEM
 P:     Alessandro Zummo
 M:     a.zummo@towertech.it
-L:     linux-kernel@vger.kernel.org
+L:     rtc-linux@googlegroups.com
 S:     Maintained
 
 REISERFS FILE SYSTEM
index aef96259051fa58211ec31b7f22b0bee3c595176..f732e75be43d1dd9449efbd99f7e646da26393c0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,11 @@ NAME=Avast! A bilge rat!
 # Comments in this file are targeted only to the developer, do not
 # expect to learn how to build the kernel reading this file.
 
-# Do not print "Entering directory ..."
-MAKEFLAGS += --no-print-directory
+# Do not:
+# o  use make's built-in rules and variables
+#    (this increases performance and avoid hard-to-debug behavour);
+# o  print "Entering directory ...";
+MAKEFLAGS += -rR --no-print-directory
 
 # We are using a recursive build, so we need to do a little thinking
 # to get the ordering right.
@@ -271,12 +274,8 @@ export quiet Q KBUILD_VERBOSE
 # Look for make include files relative to root of kernel src
 MAKEFLAGS += --include-dir=$(srctree)
 
-# We need some generic definitions
-include  $(srctree)/scripts/Kbuild.include
-
-# Do not use make's built-in rules and variables
-# This increases performance and avoid hard-to-debug behavour
-MAKEFLAGS += -rR
+# We need some generic definitions.
+include $(srctree)/scripts/Kbuild.include
 
 # Make variables (CC, etc...)
 
@@ -1101,9 +1100,9 @@ boards := $(notdir $(boards))
 
 help:
        @echo  'Cleaning targets:'
-       @echo  '  clean           - remove most generated files but keep the config and'
+       @echo  '  clean           - Remove most generated files but keep the config and'
        @echo  '                    enough build support to build external modules'
-       @echo  '  mrproper        - remove all generated files + config + various backup files'
+       @echo  '  mrproper        - Remove all generated files + config + various backup files'
        @echo  '  distclean       - mrproper + remove editor backup and patch files'
        @echo  ''
        @echo  'Configuration targets:'
@@ -1391,12 +1390,18 @@ endif #ifeq ($(mixed-targets),1)
 
 PHONY += checkstack kernelrelease kernelversion
 
-# Use $(SUBARCH) here instead of $(ARCH) so that this works for UML.
-# In the UML case, $(SUBARCH) is the name of the underlying
-# architecture, while for all other arches, it is the same as $(ARCH).
+# UML needs a little special treatment here.  It wants to use the host
+# toolchain, so needs $(SUBARCH) passed to checkstack.pl.  Everyone
+# else wants $(ARCH), including people doing cross-builds, which means
+# that $(SUBARCH) doesn't work here.
+ifeq ($(ARCH), um)
+CHECKSTACK_ARCH := $(SUBARCH)
+else
+CHECKSTACK_ARCH := $(ARCH)
+endif
 checkstack:
        $(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
-       $(PERL) $(src)/scripts/checkstack.pl $(SUBARCH)
+       $(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)
 
 kernelrelease:
        $(if $(wildcard include/config/kernel.release), $(Q)echo $(KERNELRELEASE), \
@@ -1484,6 +1489,8 @@ endif     # skip-makefile
 PHONY += FORCE
 FORCE:
 
+# Cancel implicit rules on top Makefile, `-rR' will apply to sub-makes.
+Makefile: ;
 
 # Declare the contents of the .PHONY variable as phony.  We keep that
 # information in a variable se we can use it in if_changed and friends.
index fb804043b32080b856dd3e176c9747258b747d62..be133f1f75a4d117d71544ba1536298051472d7d 100644 (file)
@@ -979,7 +979,7 @@ osf_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp,
        long timeout;
        int ret = -EINVAL;
        struct fdtable *fdt;
-       int max_fdset;
+       int max_fds;
 
        timeout = MAX_SCHEDULE_TIMEOUT;
        if (tvp) {
@@ -1003,9 +1003,9 @@ osf_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp,
 
        rcu_read_lock();
        fdt = files_fdtable(current->files);
-       max_fdset = fdt->max_fdset;
+       max_fds = fdt->max_fds;
        rcu_read_unlock();
-       if (n < 0 || n > max_fdset)
+       if (n < 0 || n > max_fds)
                goto out_nofds;
 
        /*
index a11fb9a40c04f0c16e9d46e1e2d17cfbe934b91c..2c37b70b17ab45087ff7c43d30aea6006d3f4e81 100644 (file)
@@ -423,7 +423,7 @@ static int apm_open(struct inode * inode, struct file * filp)
 {
        struct apm_user *as;
 
-       as = (struct apm_user *)kzalloc(sizeof(*as), GFP_KERNEL);
+       as = kzalloc(sizeof(*as), GFP_KERNEL);
        if (as) {
                /*
                 * XXX - this is a tiny bit broken, when we consider BSD
index a786f769035d1a8c46197dae1124b40345dddb32..71257e3d513f4604ed1d01c3db5eb8fb565bcf47 100644 (file)
@@ -353,7 +353,7 @@ int ecard_readchunk(struct in_chunk_dir *cd, ecard_t *ec, int id, int num)
                }
                if (c_id(&excd) == 0x80) { /* loader */
                        if (!ec->loader) {
-                               ec->loader = (loader_t)kmalloc(c_len(&excd),
+                               ec->loader = kmalloc(c_len(&excd),
                                                               GFP_KERNEL);
                                if (ec->loader)
                                        ecard_readbytes(ec->loader, ec,
index d135568dc9e7698e3c7ca99db7d9a083be50ef83..8781aaeb576b2d2738ead294ba6c21a182030b58 100644 (file)
@@ -43,6 +43,7 @@ config MACH_OMAP_H3
 config MACH_OMAP_OSK
        bool "TI OSK Support"
        depends on ARCH_OMAP1 && ARCH_OMAP16XX
+       select TPS65010
        help
          TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
           if you have such a board.
index 3a622801d7b0f1548a98056250860a5cea4bac37..7d0cf7af88ceb8c420b5fdb912edf3f3358170f8 100644 (file)
@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
index b457ca0a431a33a524aae6cda4e710c86e47d6b0..777564c90a12660714d74f4a69faf20d1bc75e1a 100644 (file)
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-obj-y                  := core.o irq.o time.o clock.o gpio.o serial.o dma.o
+obj-y                  := core.o irq.o time.o clock.o gpio.o serial.o dma.o i2c.o
 obj-m                  :=
 obj-n                  :=
 obj-                   :=
diff --git a/arch/arm/mach-pnx4008/i2c.c b/arch/arm/mach-pnx4008/i2c.c
new file mode 100644 (file)
index 0000000..6f30882
--- /dev/null
@@ -0,0 +1,167 @@
+/*
+ * I2C initialization for PNX4008.
+ *
+ * Author: Vitaly Wool <vitalywool@gmail.com>
+ *
+ * 2005-2006 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#include <linux/clk.h>
+#include <linux/i2c.h>
+#include <linux/i2c-pnx.h>
+#include <linux/platform_device.h>
+#include <linux/err.h>
+#include <asm/arch/platform.h>
+#include <asm/arch/i2c.h>
+
+static int set_clock_run(struct platform_device *pdev)
+{
+       struct clk *clk;
+       char name[10];
+       int retval = 0;
+
+       snprintf(name, 10, "i2c%d_ck", pdev->id);
+       clk = clk_get(&pdev->dev, name);
+       if (!IS_ERR(clk)) {
+               clk_set_rate(clk, 1);
+               clk_put(clk);
+       } else
+               retval = -ENOENT;
+
+       return retval;
+}
+
+static int set_clock_stop(struct platform_device *pdev)
+{
+       struct clk *clk;
+       char name[10];
+       int retval = 0;
+
+       snprintf(name, 10, "i2c%d_ck", pdev->id);
+       clk = clk_get(&pdev->dev, name);
+       if (!IS_ERR(clk)) {
+               clk_set_rate(clk, 0);
+               clk_put(clk);
+       } else
+               retval = -ENOENT;
+
+       return retval;
+}
+
+static int i2c_pnx_suspend(struct platform_device *pdev, pm_message_t state)
+{
+       int retval = 0;
+#ifdef CONFIG_PM
+       retval = set_clock_run(pdev);
+#endif
+       return retval;
+}
+
+static int i2c_pnx_resume(struct platform_device *pdev)
+{
+       int retval = 0;
+#ifdef CONFIG_PM
+       retval = set_clock_run(pdev);
+#endif
+       return retval;
+}