From e4b26d5a769a304f6ba82bcabf8202e823c27c5c Mon Sep 17 00:00:00 2001 From: Jean Tourrilhes Date: Tue, 10 Jul 2007 15:51:14 -0500 Subject: [PATCH] --- yaml --- r: 61514 b: refs/heads/master c: 90869b249b4621d60920d5d1d53403fe86d8ecb5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/dvb/bt8xx.txt | 32 +- trunk/Documentation/dvb/get_dvb_firmware | 63 +- trunk/Documentation/dvb/opera-firmware.txt | 27 - .../powerpc/booting-without-of.txt | 6 - trunk/Documentation/video4linux/CARDLIST.bttv | 4 +- trunk/Documentation/video4linux/CARDLIST.cx88 | 1 - .../video4linux/CARDLIST.saa7134 | 1 - .../Documentation/video4linux/CARDLIST.tuner | 3 +- trunk/Documentation/video4linux/sn9c102.txt | 3 +- trunk/Documentation/video4linux/zr364xx.txt | 2 +- trunk/MAINTAINERS | 14 +- trunk/arch/alpha/kernel/smp.c | 6 +- trunk/arch/alpha/lib/checksum.c | 1 - trunk/arch/avr32/Kconfig | 25 - trunk/arch/avr32/boards/atstk1000/Kconfig | 53 - trunk/arch/avr32/boards/atstk1000/atstk1002.c | 50 +- trunk/arch/avr32/kernel/setup.c | 4 +- trunk/arch/avr32/mach-at32ap/Makefile | 1 - trunk/arch/avr32/mach-at32ap/at32ap.c | 31 + trunk/arch/avr32/mach-at32ap/at32ap7000.c | 340 +- trunk/arch/avr32/mach-at32ap/cpufreq.c | 112 - trunk/arch/avr32/mach-at32ap/extint.c | 200 +- trunk/arch/avr32/mach-at32ap/pm.h | 112 - trunk/arch/avr32/mach-at32ap/sm.h | 242 ++ trunk/arch/frv/kernel/setup.c | 1 - trunk/arch/i386/Kconfig | 2 - trunk/arch/i386/Makefile | 3 - trunk/arch/i386/boot/Makefile | 2 +- trunk/arch/i386/boot/boot.h | 2 +- trunk/arch/i386/boot/compressed/relocs.c | 2 - trunk/arch/i386/boot/cpucheck.c | 4 +- trunk/arch/i386/boot/mca.c | 2 +- trunk/arch/i386/boot/pm.c | 2 +- trunk/arch/i386/boot/tools/build.c | 2 +- trunk/arch/i386/boot/tty.c | 2 +- trunk/arch/i386/boot/video.c | 9 +- trunk/arch/i386/boot/video.h | 9 +- trunk/arch/i386/boot/voyager.c | 2 +- trunk/arch/i386/kernel/asm-offsets.c | 9 - .../arch/i386/kernel/cpu/mcheck/therm_throt.c | 6 +- trunk/arch/i386/kernel/efi.c | 2 +- trunk/arch/i386/kernel/entry.S | 87 +- trunk/arch/i386/kernel/head.S | 5 +- trunk/arch/i386/kernel/paravirt.c | 37 +- trunk/arch/i386/kernel/ptrace.c | 22 +- trunk/arch/i386/kernel/setup.c | 2 - trunk/arch/i386/kernel/smp.c | 5 +- trunk/arch/i386/kernel/smpboot.c | 8 +- trunk/arch/i386/kernel/smpcommon.c | 8 +- trunk/arch/i386/kernel/syscall_table.S | 1 - trunk/arch/i386/kernel/traps.c | 10 +- trunk/arch/i386/kernel/tsc.c | 23 +- trunk/arch/i386/kernel/vmi.c | 4 +- trunk/arch/i386/kernel/vmiclock.c | 6 +- trunk/arch/i386/kernel/vmlinux.lds.S | 1 - trunk/arch/i386/kernel/vsyscall-note.S | 49 +- trunk/arch/i386/mach-voyager/voyager_thread.c | 2 +- trunk/arch/i386/mm/init.c | 3 +- trunk/arch/i386/mm/pageattr.c | 2 +- trunk/arch/i386/xen/Kconfig | 11 - trunk/arch/i386/xen/Makefile | 4 - trunk/arch/i386/xen/enlighten.c | 1144 ------ trunk/arch/i386/xen/events.c | 590 --- trunk/arch/i386/xen/features.c | 29 - trunk/arch/i386/xen/manage.c | 143 - trunk/arch/i386/xen/mmu.c | 564 --- trunk/arch/i386/xen/mmu.h | 60 - trunk/arch/i386/xen/multicalls.c | 90 - trunk/arch/i386/xen/multicalls.h | 45 - trunk/arch/i386/xen/setup.c | 96 - trunk/arch/i386/xen/smp.c | 404 -- trunk/arch/i386/xen/time.c | 590 --- trunk/arch/i386/xen/xen-asm.S | 291 -- trunk/arch/i386/xen/xen-head.S | 36 - trunk/arch/i386/xen/xen-ops.h | 71 - trunk/arch/ia64/hp/common/sba_iommu.c | 20 +- trunk/arch/ia64/hp/sim/boot/fw-emu.c | 5 + trunk/arch/ia64/hp/sim/simserial.c | 4 + trunk/arch/ia64/kernel/fsys.S | 4 +- trunk/arch/ia64/lib/checksum.c | 1 - trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c | 3 +- trunk/arch/m68k/lib/checksum.c | 1 - trunk/arch/mips/basler/excite/excite_setup.c | 1 - trunk/arch/mips/gt64120/wrppmc/setup.c | 1 - .../arch/mips/mips-boards/atlas/atlas_setup.c | 1 - trunk/arch/mips/mips-boards/sead/sead_setup.c | 1 - trunk/arch/mips/mipssim/sim_setup.c | 1 - .../arch/mips/pmc-sierra/msp71xx/msp_serial.c | 1 - trunk/arch/mips/pmc-sierra/yosemite/setup.c | 1 - trunk/arch/powerpc/boot/dts/mpc8641_hpcn.dts | 4 - trunk/arch/powerpc/kernel/pci-common.c | 7 +- trunk/arch/powerpc/kernel/setup_64.c | 12 +- trunk/arch/powerpc/kernel/sys_ppc32.c | 7 - trunk/arch/powerpc/sysdev/fsl_soc.c | 9 - trunk/arch/ppc/platforms/4xx/bamboo.c | 1 - trunk/arch/ppc/platforms/4xx/bubinga.c | 1 - trunk/arch/ppc/platforms/4xx/cpci405.c | 1 - trunk/arch/ppc/platforms/4xx/ebony.c | 1 - trunk/arch/ppc/platforms/4xx/luan.c | 1 - trunk/arch/ppc/platforms/4xx/ocotea.c | 1 - trunk/arch/ppc/platforms/4xx/taishan.c | 1 - trunk/arch/ppc/platforms/4xx/yucca.c | 1 - trunk/arch/ppc/platforms/85xx/sbc8560.c | 1 - trunk/arch/ppc/platforms/chestnut.c | 1 - trunk/arch/ppc/platforms/ev64260.c | 1 - trunk/arch/ppc/platforms/radstone_ppc7d.c | 1 - trunk/arch/ppc/platforms/spruce.c | 1 - trunk/arch/s390/defconfig | 110 +- trunk/arch/s390/kernel/dis.c | 7 +- trunk/arch/s390/kernel/stacktrace.c | 26 +- trunk/arch/sh64/lib/c-checksum.c | 1 - trunk/arch/sparc/Kconfig | 6 - trunk/arch/sparc64/Kconfig | 3 - trunk/arch/sparc64/defconfig | 155 +- trunk/arch/sparc64/kernel/ds.c | 19 - trunk/arch/sparc64/kernel/hvtramp.S | 3 +- trunk/arch/sparc64/kernel/mdesc.c | 78 +- trunk/arch/sparc64/kernel/signal.c | 15 +- trunk/arch/sparc64/kernel/vio.c | 94 +- trunk/arch/sparc64/kernel/viohs.c | 30 - trunk/arch/um/drivers/pcap_user.c | 2 +- trunk/arch/x86_64/ia32/ia32entry.S | 1 - trunk/arch/x86_64/ia32/sys_ia32.c | 8 - trunk/arch/x86_64/kernel/early_printk.c | 5 - trunk/arch/x86_64/kernel/mce.c | 2 +- trunk/arch/x86_64/kernel/ptrace.c | 23 +- trunk/arch/x86_64/kernel/smp.c | 12 +- trunk/block/Kconfig | 13 +- trunk/block/bsg.c | 167 +- trunk/drivers/Makefile | 2 - trunk/drivers/acpi/thermal.c | 24 +- trunk/drivers/ata/sata_mv.c | 2 +- trunk/drivers/atm/Kconfig | 2 +- trunk/drivers/atm/ambassador.c | 4 +- trunk/drivers/atm/eni.c | 19 +- trunk/drivers/atm/firestream.c | 14 +- trunk/drivers/atm/idt77252.c | 6 +- trunk/drivers/atm/lanai.c | 4 +- trunk/drivers/atm/nicstarmac.c | 2 +- trunk/drivers/atm/zatm.c | 4 +- trunk/drivers/block/Kconfig | 9 - trunk/drivers/block/Makefile | 1 - trunk/drivers/block/sunvdc.c | 97 +- trunk/drivers/block/xen-blkfront.c | 988 ----- trunk/drivers/char/Kconfig | 49 +- trunk/drivers/char/Makefile | 1 - trunk/drivers/char/cyclades.c | 4 +- trunk/drivers/char/decserial.c | 67 + trunk/drivers/char/hvc_xen.c | 159 - trunk/drivers/char/watchdog/Kconfig | 9 - trunk/drivers/char/watchdog/Makefile | 3 - trunk/drivers/char/watchdog/at32ap700x_wdt.c | 386 -- trunk/drivers/char/watchdog/ep93xx_wdt.c | 4 + trunk/drivers/char/watchdog/mixcomwd.c | 127 +- trunk/drivers/char/watchdog/pnx4008_wdt.c | 4 + trunk/drivers/char/watchdog/s3c2410_wdt.c | 41 +- trunk/drivers/ide/ide.c | 10 +- trunk/drivers/infiniband/hw/mthca/mthca_qp.c | 4 +- trunk/drivers/isdn/hisax/bkm_a4t.c | 108 +- trunk/drivers/isdn/hisax/config.c | 233 +- trunk/drivers/isdn/hisax/enternow_pci.c | 165 +- trunk/drivers/isdn/hisax/hfc_pci.c | 191 +- trunk/drivers/isdn/hisax/nj_s.c | 194 +- trunk/drivers/isdn/hisax/nj_u.c | 167 +- trunk/drivers/kvm/Kconfig | 9 +- trunk/drivers/kvm/kvm.h | 116 +- trunk/drivers/kvm/kvm_main.c | 456 +-- trunk/drivers/kvm/mmu.c | 292 +- trunk/drivers/kvm/paging_tmpl.h | 273 +- trunk/drivers/kvm/svm.c | 59 +- trunk/drivers/kvm/svm.h | 3 - trunk/drivers/kvm/vmx.c | 652 ++- trunk/drivers/kvm/x86_emulate.c | 44 +- trunk/drivers/macintosh/therm_pm72.c | 3 +- trunk/drivers/macintosh/windfarm_core.c | 3 +- trunk/drivers/md/dm-exception-store.c | 1 - trunk/drivers/media/Kconfig | 4 - trunk/drivers/media/common/ir-functions.c | 23 +- trunk/drivers/media/common/saa7146_core.c | 8 +- trunk/drivers/media/common/saa7146_video.c | 8 +- trunk/drivers/media/dvb/b2c2/Kconfig | 2 +- trunk/drivers/media/dvb/b2c2/Makefile | 2 +- .../drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 4 +- trunk/drivers/media/dvb/bt8xx/Kconfig | 2 +- trunk/drivers/media/dvb/bt8xx/Makefile | 2 +- trunk/drivers/media/dvb/bt8xx/dst.c | 2 +- trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c | 5 +- trunk/drivers/media/dvb/cinergyT2/Makefile | 2 +- trunk/drivers/media/dvb/cinergyT2/cinergyT2.c | 19 +- trunk/drivers/media/dvb/dvb-core/dmxdev.c | 2 +- .../media/dvb/dvb-core/dvb_ca_en50221.c | 12 +- trunk/drivers/media/dvb/dvb-core/dvb_demux.c | 2 +- .../drivers/media/dvb/dvb-core/dvb_frontend.h | 2 +- trunk/drivers/media/dvb/dvb-core/dvb_net.c | 5 +- trunk/drivers/media/dvb/dvb-core/dvbdev.c | 10 +- trunk/drivers/media/dvb/dvb-usb/Kconfig | 29 +- trunk/drivers/media/dvb/dvb-usb/Makefile | 8 +- trunk/drivers/media/dvb/dvb-usb/af9005-fe.c | 1503 ------- .../drivers/media/dvb/dvb-usb/af9005-remote.c | 157 - .../drivers/media/dvb/dvb-usb/af9005-script.h | 203 - trunk/drivers/media/dvb/dvb-usb/af9005.c | 1141 ------ trunk/drivers/media/dvb/dvb-usb/af9005.h | 3496 ----------------- trunk/drivers/media/dvb/dvb-usb/cxusb.c | 18 +- .../drivers/media/dvb/dvb-usb/dibusb-common.c | 2 +- trunk/drivers/media/dvb/dvb-usb/dibusb-mb.c | 53 +- trunk/drivers/media/dvb/dvb-usb/dibusb.h | 1 - trunk/drivers/media/dvb/dvb-usb/digitv.c | 21 +- trunk/drivers/media/dvb/dvb-usb/digitv.h | 4 - trunk/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | 79 + trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 6 - .../media/dvb/dvb-usb/dvb-usb-remote.c | 2 +- trunk/drivers/media/dvb/dvb-usb/dvb-usb.h | 11 + trunk/drivers/media/dvb/dvb-usb/gl861.c | 7 +- trunk/drivers/media/dvb/dvb-usb/m920x.c | 127 +- trunk/drivers/media/dvb/dvb-usb/m920x.h | 5 +- trunk/drivers/media/dvb/dvb-usb/opera1.c | 25 +- trunk/drivers/media/dvb/dvb-usb/umt-010.c | 8 +- trunk/drivers/media/dvb/frontends/Makefile | 2 +- trunk/drivers/media/dvb/frontends/cx22702.c | 1 + trunk/drivers/media/dvb/frontends/cx24123.c | 2 +- trunk/drivers/media/dvb/frontends/dvb-pll.c | 256 +- trunk/drivers/media/dvb/frontends/dvb-pll.h | 73 +- trunk/drivers/media/dvb/frontends/nxt200x.c | 23 +- trunk/drivers/media/dvb/frontends/nxt200x.h | 3 + trunk/drivers/media/dvb/frontends/or51132.c | 1 + trunk/drivers/media/dvb/frontends/or51211.c | 31 +- trunk/drivers/media/dvb/frontends/stv0299.c | 2 +- trunk/drivers/media/dvb/frontends/tda10023.c | 2 +- trunk/drivers/media/dvb/pluto2/Makefile | 2 +- trunk/drivers/media/dvb/ttpci/Kconfig | 2 +- trunk/drivers/media/dvb/ttpci/Makefile | 2 +- trunk/drivers/media/dvb/ttpci/av7110.c | 13 +- trunk/drivers/media/dvb/ttpci/av7110.h | 1 - trunk/drivers/media/dvb/ttpci/av7110_av.c | 20 +- trunk/drivers/media/dvb/ttpci/av7110_ca.c | 4 +- trunk/drivers/media/dvb/ttpci/av7110_hw.c | 8 +- trunk/drivers/media/dvb/ttpci/av7110_hw.h | 2 +- trunk/drivers/media/dvb/ttpci/av7110_ir.c | 2 +- trunk/drivers/media/dvb/ttpci/av7110_v4l.c | 2 +- trunk/drivers/media/dvb/ttpci/budget-av.c | 31 +- trunk/drivers/media/dvb/ttpci/budget-ci.c | 2 +- trunk/drivers/media/dvb/ttusb-budget/Makefile | 2 +- trunk/drivers/media/dvb/ttusb-dec/Makefile | 2 +- trunk/drivers/media/radio/Kconfig | 4 +- trunk/drivers/media/radio/radio-aimslab.c | 1 + trunk/drivers/media/radio/radio-aztech.c | 1 + trunk/drivers/media/radio/radio-gemtek-pci.c | 1 + trunk/drivers/media/radio/radio-gemtek.c | 1 + trunk/drivers/media/radio/radio-rtrack2.c | 1 + trunk/drivers/media/radio/radio-sf16fmi.c | 1 + trunk/drivers/media/radio/radio-sf16fmr2.c | 1 + trunk/drivers/media/radio/radio-terratec.c | 1 + trunk/drivers/media/radio/radio-trust.c | 1 + trunk/drivers/media/radio/radio-typhoon.c | 1 + trunk/drivers/media/video/Kconfig | 9 - trunk/drivers/media/video/Makefile | 6 +- trunk/drivers/media/video/adv7170.c | 8 +- trunk/drivers/media/video/adv7175.c | 8 +- trunk/drivers/media/video/bt819.c | 9 +- trunk/drivers/media/video/bt856.c | 8 +- trunk/drivers/media/video/bt8xx/bttv-cards.c | 442 +-- trunk/drivers/media/video/bt8xx/bttv-driver.c | 34 +- trunk/drivers/media/video/bt8xx/bttv-input.c | 2 +- trunk/drivers/media/video/bt8xx/bttv.h | 2 - trunk/drivers/media/video/bt8xx/bttvp.h | 2 +- trunk/drivers/media/video/cpia2/cpia2_core.c | 9 +- trunk/drivers/media/video/cpia2/cpia2_v4l.c | 8 +- trunk/drivers/media/video/cx88/Kconfig | 2 +- .../drivers/media/video/cx88/cx88-blackbird.c | 14 +- trunk/drivers/media/video/cx88/cx88-cards.c | 24 - trunk/drivers/media/video/cx88/cx88-dvb.c | 122 +- trunk/drivers/media/video/cx88/cx88-i2c.c | 25 +- trunk/drivers/media/video/cx88/cx88-input.c | 25 +- trunk/drivers/media/video/cx88/cx88-mpeg.c | 2 +- .../media/video/cx88/cx88-vp3054-i2c.c | 12 +- .../media/video/cx88/cx88-vp3054-i2c.h | 7 - trunk/drivers/media/video/cx88/cx88.h | 6 +- trunk/drivers/media/video/et61x251/Kconfig | 2 +- trunk/drivers/media/video/et61x251/et61x251.h | 23 +- .../media/video/et61x251/et61x251_core.c | 189 +- .../media/video/et61x251/et61x251_sensor.h | 8 +- .../video/et61x251/et61x251_tas5130d1b.c | 2 +- trunk/drivers/media/video/ir-kbd-i2c.c | 53 +- trunk/drivers/media/video/ivtv/ivtv-driver.c | 13 +- trunk/drivers/media/video/ivtv/ivtv-driver.h | 19 +- trunk/drivers/media/video/ivtv/ivtv-fileops.c | 8 +- .../drivers/media/video/ivtv/ivtv-firmware.c | 4 +- trunk/drivers/media/video/ivtv/ivtv-gpio.c | 9 +- trunk/drivers/media/video/ivtv/ivtv-ioctl.c | 4 +- trunk/drivers/media/video/ivtv/ivtv-irq.c | 36 +- trunk/drivers/media/video/ivtv/ivtv-streams.c | 35 +- trunk/drivers/media/video/ivtv/ivtv-vbi.c | 31 +- trunk/drivers/media/video/msp3400-driver.c | 6 +- trunk/drivers/media/video/mt20xx.c | 80 +- trunk/drivers/media/video/ov7670.c | 4 +- trunk/drivers/media/video/pwc/pwc-if.c | 12 +- trunk/drivers/media/video/pwc/pwc.h | 4 +- trunk/drivers/media/video/saa7111.c | 8 +- trunk/drivers/media/video/saa7114.c | 10 +- trunk/drivers/media/video/saa7134/Kconfig | 2 +- .../media/video/saa7134/saa7134-alsa.c | 16 +- .../media/video/saa7134/saa7134-cards.c | 41 +- .../drivers/media/video/saa7134/saa7134-dvb.c | 169 +- .../media/video/saa7134/saa7134-empress.c | 8 - .../media/video/saa7134/saa7134-input.c | 20 +- .../media/video/saa7134/saa7134-tvaudio.c | 42 +- trunk/drivers/media/video/saa7134/saa7134.h | 6 +- trunk/drivers/media/video/saa7185.c | 8 +- trunk/drivers/media/video/sn9c102/sn9c102.h | 9 +- .../media/video/sn9c102/sn9c102_core.c | 173 +- .../media/video/sn9c102/sn9c102_ov7630.c | 214 +- .../media/video/sn9c102/sn9c102_ov7660.c | 88 +- trunk/drivers/media/video/stradis.c | 2 +- trunk/drivers/media/video/stv680.c | 7 +- trunk/drivers/media/video/tda8290.c | 129 +- trunk/drivers/media/video/tda9887.c | 57 +- trunk/drivers/media/video/tea5761.c | 243 -- trunk/drivers/media/video/tea5767.c | 16 +- trunk/drivers/media/video/tuner-core.c | 95 +- trunk/drivers/media/video/tuner-driver.h | 107 - trunk/drivers/media/video/tuner-simple.c | 27 +- trunk/drivers/media/video/tuner-types.c | 22 +- trunk/drivers/media/video/tveeprom.c | 8 +- trunk/drivers/media/video/tvp5150.c | 2 +- trunk/drivers/media/video/usbvideo/konicawc.c | 2 +- .../media/video/usbvideo/quickcam_messenger.c | 4 +- trunk/drivers/media/video/usbvideo/vicam.c | 181 + .../media/video/usbvision/usbvision-cards.c | 8 +- .../media/video/usbvision/usbvision-core.c | 43 +- .../media/video/usbvision/usbvision-video.c | 1561 ++++---- .../drivers/media/video/usbvision/usbvision.h | 13 +- trunk/drivers/media/video/vino.c | 6 +- trunk/drivers/media/video/vivi.c | 178 +- trunk/drivers/media/video/zc0301/Kconfig | 2 +- trunk/drivers/media/video/zc0301/zc0301.h | 21 +- .../drivers/media/video/zc0301/zc0301_core.c | 147 +- .../media/video/zc0301/zc0301_pas202bcb.c | 1 - .../media/video/zc0301/zc0301_pb0330.c | 1 - .../media/video/zc0301/zc0301_sensor.h | 2 +- trunk/drivers/media/video/zoran_driver.c | 63 + trunk/drivers/media/video/zr364xx.c | 18 +- trunk/drivers/mtd/ubi/build.c | 25 +- trunk/drivers/mtd/ubi/cdev.c | 49 +- trunk/drivers/mtd/ubi/debug.c | 44 +- trunk/drivers/mtd/ubi/debug.h | 2 + trunk/drivers/mtd/ubi/eba.c | 102 +- trunk/drivers/mtd/ubi/gluebi.c | 27 +- trunk/drivers/mtd/ubi/io.c | 65 +- trunk/drivers/mtd/ubi/kapi.c | 19 +- trunk/drivers/mtd/ubi/misc.c | 4 +- trunk/drivers/mtd/ubi/scan.c | 127 +- trunk/drivers/mtd/ubi/scan.h | 2 + trunk/drivers/mtd/ubi/ubi.h | 3 - trunk/drivers/mtd/ubi/upd.c | 4 +- trunk/drivers/mtd/ubi/vmt.c | 53 +- trunk/drivers/mtd/ubi/vtbl.c | 85 +- trunk/drivers/mtd/ubi/wl.c | 93 +- trunk/drivers/net/Kconfig | 12 - trunk/drivers/net/Makefile | 2 - trunk/drivers/net/arm/ether3.c | 2 +- trunk/drivers/net/atl1/atl1_main.c | 1 - trunk/drivers/net/bnx2.c | 103 +- trunk/drivers/net/bnx2.h | 10 +- trunk/drivers/net/eepro100.c | 7 +- trunk/drivers/net/gianfar.c | 12 +- trunk/drivers/net/hamradio/baycom_epp.c | 2 +- trunk/drivers/net/natsemi.c | 2 +- trunk/drivers/net/ne2k-pci.c | 7 +- trunk/drivers/net/ni5010.c | 6 +- trunk/drivers/net/ns83820.c | 2 +- trunk/drivers/net/phy/vitesse.c | 46 +- trunk/drivers/net/pppol2tp.c | 18 +- trunk/drivers/net/r8169.c | 2 +- trunk/drivers/net/saa9730.c | 9 +- trunk/drivers/net/sunvnet.c | 260 +- trunk/drivers/net/sunvnet.h | 4 +- trunk/drivers/net/tokenring/smctr.c | 6 +- trunk/drivers/net/wan/pc300_drv.c | 2 - trunk/drivers/net/wan/sbni.c | 7 +- trunk/drivers/net/xen-netfront.c | 1863 --------- trunk/drivers/parisc/hppb.c | 1 - trunk/drivers/parisc/superio.c | 1 - trunk/drivers/pnp/pnpbios/core.c | 2 +- trunk/drivers/s390/char/Kconfig | 7 - trunk/drivers/s390/char/Makefile | 1 - trunk/drivers/s390/char/vmcp.c | 89 +- trunk/drivers/s390/char/vmcp.h | 4 +- trunk/drivers/s390/char/vmur.c | 906 ----- trunk/drivers/s390/char/vmur.h | 104 - trunk/drivers/s390/cio/device.c | 2 +- trunk/drivers/s390/cio/qdio.c | 16 +- trunk/drivers/sbus/char/bbc_envctrl.c | 5 +- trunk/drivers/sbus/char/envctrl.c | 7 +- trunk/drivers/serial/8250_hp300.c | 1 - trunk/drivers/serial/Kconfig | 30 - trunk/drivers/serial/Makefile | 1 - trunk/drivers/serial/zs.c | 1287 ------ trunk/drivers/serial/zs.h | 284 -- trunk/drivers/tc/Makefile | 1 + trunk/drivers/tc/zs.c | 2203 +++++++++++ trunk/drivers/tc/zs.h | 404 ++ trunk/drivers/telephony/Kconfig | 1 - trunk/drivers/telephony/ixj.c | 7 +- trunk/drivers/usb/Kconfig | 2 +- trunk/drivers/usb/misc/auerswald.c | 4 +- trunk/drivers/video/logo/Kconfig | 2 +- trunk/drivers/video/matrox/matroxfb_maven.c | 9 +- trunk/drivers/video/riva/riva_hw.c | 7 +- trunk/drivers/xen/Makefile | 2 - trunk/drivers/xen/grant-table.c | 582 --- trunk/drivers/xen/xenbus/Makefile | 7 - trunk/drivers/xen/xenbus/xenbus_client.c | 569 --- trunk/drivers/xen/xenbus/xenbus_comms.c | 233 -- trunk/drivers/xen/xenbus/xenbus_comms.h | 46 - trunk/drivers/xen/xenbus/xenbus_probe.c | 935 ----- trunk/drivers/xen/xenbus/xenbus_probe.h | 74 - trunk/drivers/xen/xenbus/xenbus_xs.c | 861 ---- trunk/fs/9p/v9fs.c | 2 - trunk/fs/Kconfig | 10 +- trunk/fs/anon_inodes.c | 1 - trunk/fs/attr.c | 4 +- trunk/fs/ext2/acl.c | 2 +- trunk/fs/ext2/ioctl.c | 4 +- trunk/fs/ext3/acl.c | 2 +- trunk/fs/ext3/ioctl.c | 6 +- trunk/fs/ext4/acl.c | 2 +- trunk/fs/ext4/balloc.c | 4 +- trunk/fs/ext4/extents.c | 682 +--- trunk/fs/ext4/file.c | 1 - trunk/fs/ext4/ialloc.c | 8 +- trunk/fs/ext4/inode.c | 118 +- trunk/fs/ext4/ioctl.c | 15 +- trunk/fs/ext4/namei.c | 76 +- trunk/fs/ext4/super.c | 50 +- trunk/fs/ext4/xattr.c | 276 +- trunk/fs/ext4/xattr.h | 17 - trunk/fs/fcntl.c | 2 +- trunk/fs/generic_acl.c | 2 +- trunk/fs/gfs2/acl.c | 2 +- trunk/fs/hfsplus/ioctl.c | 2 +- trunk/fs/jbd2/journal.c | 79 +- trunk/fs/jbd2/recovery.c | 2 +- trunk/fs/jffs2/acl.c | 2 +- trunk/fs/jfs/ioctl.c | 2 +- trunk/fs/jfs/xattr.c | 2 +- trunk/fs/namei.c | 2 +- trunk/fs/ocfs2/file.c | 3 +- trunk/fs/ocfs2/heartbeat.c | 2 +- trunk/fs/ocfs2/ioctl.c | 2 +- trunk/fs/open.c | 59 - trunk/fs/reiserfs/ioctl.c | 5 +- trunk/fs/reiserfs/xattr_acl.c | 2 +- trunk/fs/udf/super.c | 2 +- trunk/fs/utimes.c | 2 +- trunk/fs/xattr.c | 3 +- trunk/include/asm-alpha/termios.h | 4 +- trunk/include/asm-avr32/arch-at32ap/board.h | 14 - trunk/include/asm-avr32/arch-at32ap/sm.h | 27 + trunk/include/asm-avr32/atomic.h | 4 +- trunk/include/asm-avr32/unaligned.h | 15 +- trunk/include/asm-generic/unaligned.h | 16 +- trunk/include/asm-i386/irq.h | 1 - .../mach-default/irq_vectors_limits.h | 2 +- trunk/include/asm-i386/mmu_context.h | 2 - trunk/include/asm-i386/paravirt.h | 22 +- trunk/include/asm-i386/pgalloc.h | 6 +- trunk/include/asm-i386/setup.h | 4 - trunk/include/asm-i386/smp.h | 5 - trunk/include/asm-i386/timer.h | 32 +- trunk/include/asm-i386/unistd.h | 3 +- trunk/include/asm-i386/vmi_time.h | 2 +- trunk/include/asm-i386/xen/hypercall.h | 413 -- trunk/include/asm-i386/xen/hypervisor.h | 73 - trunk/include/asm-i386/xen/interface.h | 188 - trunk/include/asm-ia64/ioctls.h | 4 - trunk/include/asm-ia64/termbits.h | 5 +- trunk/include/asm-ia64/termios.h | 6 +- trunk/include/asm-mips/dec/serial.h | 36 + trunk/include/asm-powerpc/systbl.h | 1 - trunk/include/asm-powerpc/unistd.h | 3 +- trunk/include/asm-sparc64/io.h | 5 + trunk/include/asm-sparc64/mdesc.h | 10 - trunk/include/asm-sparc64/vio.h | 2 +- trunk/include/asm-x86_64/unistd.h | 2 - trunk/include/linux/bsg.h | 1 + trunk/include/linux/elfnote.h | 22 +- trunk/include/linux/ext4_fs.h | 104 +- trunk/include/linux/ext4_fs_extents.h | 43 +- trunk/include/linux/ext4_fs_i.h | 5 - trunk/include/linux/ext4_fs_sb.h | 3 +- trunk/include/linux/falloc.h | 6 - trunk/include/linux/fs.h | 6 - trunk/include/linux/fsl_devices.h | 1 - trunk/include/linux/jbd2.h | 6 +- trunk/include/linux/kmod.h | 52 +- trunk/include/linux/magic.h | 1 + trunk/include/linux/major.h | 2 - trunk/include/linux/netdevice.h | 2 + .../linux/netfilter_ipv4/ipt_iprange.h | 2 - trunk/include/linux/notifier.h | 3 - trunk/include/linux/page-flags.h | 5 - trunk/include/linux/reboot.h | 5 - trunk/include/linux/serial_8250.h | 2 - trunk/include/linux/serial_core.h | 5 +- trunk/include/linux/slob_def.h | 10 + trunk/include/linux/smp.h | 13 +- trunk/include/linux/string.h | 4 - trunk/include/linux/syscalls.h | 1 - trunk/include/linux/vmalloc.h | 4 - trunk/include/media/saa7146.h | 6 +- trunk/include/media/tuner.h | 71 +- trunk/include/mtd/ubi-header.h | 101 +- trunk/include/net/tcp.h | 6 +- trunk/include/net/xfrm.h | 1 + trunk/include/xen/events.h | 48 - trunk/include/xen/features.h | 23 - trunk/include/xen/grant_table.h | 107 - trunk/include/xen/hvc-console.h | 6 - trunk/include/xen/interface/elfnote.h | 133 - trunk/include/xen/interface/event_channel.h | 195 - trunk/include/xen/interface/features.h | 43 - trunk/include/xen/interface/grant_table.h | 375 -- trunk/include/xen/interface/io/blkif.h | 94 - trunk/include/xen/interface/io/console.h | 23 - trunk/include/xen/interface/io/netif.h | 158 - trunk/include/xen/interface/io/ring.h | 260 -- trunk/include/xen/interface/io/xenbus.h | 44 - trunk/include/xen/interface/io/xs_wire.h | 87 - trunk/include/xen/interface/memory.h | 145 - trunk/include/xen/interface/physdev.h | 145 - trunk/include/xen/interface/sched.h | 77 - trunk/include/xen/interface/vcpu.h | 167 - trunk/include/xen/interface/version.h | 60 - trunk/include/xen/interface/xen.h | 447 --- trunk/include/xen/page.h | 179 - trunk/include/xen/xenbus.h | 234 -- trunk/ipc/msg.c | 4 +- trunk/ipc/sem.c | 2 +- trunk/kernel/auditfilter.c | 12 +- trunk/kernel/cpu.c | 16 +- trunk/kernel/cpuset.c | 5 +- trunk/kernel/kmod.c | 216 +- trunk/kernel/sys.c | 58 - trunk/kernel/sysctl.c | 10 - trunk/lib/Makefile | 2 +- trunk/lib/argv_split.c | 105 - trunk/lib/kobject_uevent.c | 2 +- trunk/mm/util.c | 26 +- trunk/mm/vmalloc.c | 53 - trunk/net/atm/br2684.c | 4 + trunk/net/bridge/br_stp_if.c | 2 +- trunk/net/core/dev.c | 38 +- trunk/net/core/dev_mcast.c | 12 + trunk/net/core/gen_estimator.c | 81 +- trunk/net/ieee80211/ieee80211_wx.c | 7 +- trunk/net/ipv4/tcp_bic.c | 2 +- trunk/net/ipv4/tcp_cong.c | 3 +- trunk/net/ipv4/tcp_cubic.c | 2 +- trunk/net/ipv4/tcp_highspeed.c | 2 +- trunk/net/ipv4/tcp_htcp.c | 2 +- trunk/net/ipv4/tcp_hybla.c | 4 +- trunk/net/ipv4/tcp_illinois.c | 2 +- trunk/net/ipv4/tcp_input.c | 8 +- trunk/net/ipv4/tcp_lp.c | 5 +- trunk/net/ipv4/tcp_scalable.c | 2 +- trunk/net/ipv4/tcp_vegas.c | 6 +- trunk/net/ipv4/tcp_veno.c | 6 +- trunk/net/ipv4/tcp_yeah.c | 2 +- trunk/net/irda/af_irda.c | 2 +- trunk/net/irda/irda_device.c | 4 +- trunk/net/irda/iriap.c | 2 +- trunk/net/irda/irias_object.c | 43 +- trunk/net/irda/irlap.c | 2 +- trunk/net/irda/irlmp.c | 2 +- trunk/net/irda/irproc.c | 2 +- trunk/net/irda/irsysctl.c | 2 +- trunk/net/irda/irttp.c | 2 +- trunk/net/netfilter/Kconfig | 1 - trunk/net/netlink/af_netlink.c | 5 +- trunk/net/sched/Kconfig | 6 +- trunk/net/sched/sch_atm.c | 3 +- trunk/net/xfrm/xfrm_policy.c | 2 +- trunk/security/keys/request_key.c | 3 +- trunk/security/selinux/hooks.c | 2 +- trunk/sound/pci/mixart/mixart_hwdep.c | 1 - 586 files changed, 9434 insertions(+), 33410 deletions(-) delete mode 100644 trunk/Documentation/dvb/opera-firmware.txt delete mode 100644 trunk/arch/avr32/boards/atstk1000/Kconfig delete mode 100644 trunk/arch/avr32/mach-at32ap/cpufreq.c delete mode 100644 trunk/arch/avr32/mach-at32ap/pm.h create mode 100644 trunk/arch/avr32/mach-at32ap/sm.h delete mode 100644 trunk/arch/i386/xen/Kconfig delete mode 100644 trunk/arch/i386/xen/Makefile delete mode 100644 trunk/arch/i386/xen/enlighten.c delete mode 100644 trunk/arch/i386/xen/events.c delete mode 100644 trunk/arch/i386/xen/features.c delete mode 100644 trunk/arch/i386/xen/manage.c delete mode 100644 trunk/arch/i386/xen/mmu.c delete mode 100644 trunk/arch/i386/xen/mmu.h delete mode 100644 trunk/arch/i386/xen/multicalls.c delete mode 100644 trunk/arch/i386/xen/multicalls.h delete mode 100644 trunk/arch/i386/xen/setup.c delete mode 100644 trunk/arch/i386/xen/smp.c delete mode 100644 trunk/arch/i386/xen/time.c delete mode 100644 trunk/arch/i386/xen/xen-asm.S delete mode 100644 trunk/arch/i386/xen/xen-head.S delete mode 100644 trunk/arch/i386/xen/xen-ops.h delete mode 100644 trunk/drivers/block/xen-blkfront.c create mode 100644 trunk/drivers/char/decserial.c delete mode 100644 trunk/drivers/char/hvc_xen.c delete mode 100644 trunk/drivers/char/watchdog/at32ap700x_wdt.c delete mode 100644 trunk/drivers/media/dvb/dvb-usb/af9005-fe.c delete mode 100644 trunk/drivers/media/dvb/dvb-usb/af9005-remote.c delete mode 100644 trunk/drivers/media/dvb/dvb-usb/af9005-script.h delete mode 100644 trunk/drivers/media/dvb/dvb-usb/af9005.c delete mode 100644 trunk/drivers/media/dvb/dvb-usb/af9005.h delete mode 100644 trunk/drivers/media/video/tea5761.c delete mode 100644 trunk/drivers/media/video/tuner-driver.h delete mode 100644 trunk/drivers/net/xen-netfront.c delete mode 100644 trunk/drivers/s390/char/vmur.c delete mode 100644 trunk/drivers/s390/char/vmur.h delete mode 100644 trunk/drivers/serial/zs.c delete mode 100644 trunk/drivers/serial/zs.h create mode 100644 trunk/drivers/tc/zs.c create mode 100644 trunk/drivers/tc/zs.h delete mode 100644 trunk/drivers/xen/Makefile delete mode 100644 trunk/drivers/xen/grant-table.c delete mode 100644 trunk/drivers/xen/xenbus/Makefile delete mode 100644 trunk/drivers/xen/xenbus/xenbus_client.c delete mode 100644 trunk/drivers/xen/xenbus/xenbus_comms.c delete mode 100644 trunk/drivers/xen/xenbus/xenbus_comms.h delete mode 100644 trunk/drivers/xen/xenbus/xenbus_probe.c delete mode 100644 trunk/drivers/xen/xenbus/xenbus_probe.h delete mode 100644 trunk/drivers/xen/xenbus/xenbus_xs.c create mode 100644 trunk/include/asm-avr32/arch-at32ap/sm.h delete mode 100644 trunk/include/asm-i386/xen/hypercall.h delete mode 100644 trunk/include/asm-i386/xen/hypervisor.h delete mode 100644 trunk/include/asm-i386/xen/interface.h create mode 100644 trunk/include/asm-mips/dec/serial.h delete mode 100644 trunk/include/linux/falloc.h delete mode 100644 trunk/include/xen/events.h delete mode 100644 trunk/include/xen/features.h delete mode 100644 trunk/include/xen/grant_table.h delete mode 100644 trunk/include/xen/hvc-console.h delete mode 100644 trunk/include/xen/interface/elfnote.h delete mode 100644 trunk/include/xen/interface/event_channel.h delete mode 100644 trunk/include/xen/interface/features.h delete mode 100644 trunk/include/xen/interface/grant_table.h delete mode 100644 trunk/include/xen/interface/io/blkif.h delete mode 100644 trunk/include/xen/interface/io/console.h delete mode 100644 trunk/include/xen/interface/io/netif.h delete mode 100644 trunk/include/xen/interface/io/ring.h delete mode 100644 trunk/include/xen/interface/io/xenbus.h delete mode 100644 trunk/include/xen/interface/io/xs_wire.h delete mode 100644 trunk/include/xen/interface/memory.h delete mode 100644 trunk/include/xen/interface/physdev.h delete mode 100644 trunk/include/xen/interface/sched.h delete mode 100644 trunk/include/xen/interface/vcpu.h delete mode 100644 trunk/include/xen/interface/version.h delete mode 100644 trunk/include/xen/interface/xen.h delete mode 100644 trunk/include/xen/page.h delete mode 100644 trunk/include/xen/xenbus.h delete mode 100644 trunk/lib/argv_split.c diff --git a/[refs] b/[refs] index 091748f48d12..093c21381cd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbf812d6ae6da1bfd01ea6abc5af60b358e4f9ba +refs/heads/master: 90869b249b4621d60920d5d1d53403fe86d8ecb5 diff --git a/trunk/Documentation/dvb/bt8xx.txt b/trunk/Documentation/dvb/bt8xx.txt index ecb47adda063..4e7614e606c5 100644 --- a/trunk/Documentation/dvb/bt8xx.txt +++ b/trunk/Documentation/dvb/bt8xx.txt @@ -9,29 +9,19 @@ for accessing the i2c bus and the gpio pins of the bt8xx chipset. Please see Documentation/dvb/cards.txt => o Cards based on the Conexant Bt8xx PCI bridge: Compiling kernel please enable: -a.)"Device drivers" => "Multimedia devices" => "Video For Linux" => "Enable Video for Linux API 1 (DEPRECATED)" -b.)"Device drivers" => "Multimedia devices" => "Video For Linux" => "Video Capture Adapters" => "BT848 Video For Linux" -c.)"Device drivers" => "Multimedia devices" => "Digital Video Broadcasting Devices" => "DVB for Linux" "DVB Core Support" "Bt8xx based PCI Cards" - -Please use the following options with care as deselection of drivers which are in fact necessary -may result in DVB devices that cannot be tuned due to lack of driver support: -You can save RAM by deselecting every frontend module that your DVB card does not need. - -First please remove the static dependency of DVB card drivers on all frontend modules for all possible card variants by enabling: -d.) "Device drivers" => "Multimedia devices" => "Digital Video Broadcasting Devices" - => "DVB for Linux" "DVB Core Support" "Load and attach frontend modules as needed" - -If you know the frontend driver that your card needs please enable: -e.)"Device drivers" => "Multimedia devices" => "Digital Video Broadcasting Devices" - => "DVB for Linux" "DVB Core Support" "Customise DVB Frontends" => "Customise the frontend modules to build" - Then please select your card-specific frontend module. +a.)"Device drivers" => "Multimedia devices" => "Video For Linux" => "BT848 Video For Linux" +b.)"Device drivers" => "Multimedia devices" => "Digital Video Broadcasting Devices" + => "DVB for Linux" "DVB Core Support" "Bt8xx based PCI Cards" 2) Loading Modules ================== -Regular case: If the bttv driver detects a bt8xx-based DVB card, all frontend and backend modules will be loaded automatically. -Exceptions are: -- Old TwinHan DST cards or clones with or without CA slot and not containing an Eeprom. +In default cases bttv is loaded automatically. +To load the backend either place dvb-bt8xx in etc/modules, or apply manually: + + $ modprobe dvb-bt8xx + +All frontends will be loaded automatically. People running udev please see Documentation/dvb/udev.txt. In the following cases overriding the PCI type detection for dvb-bt8xx might be necessary: @@ -40,6 +30,7 @@ In the following cases overriding the PCI type detection for dvb-bt8xx might be ------------------------------ $ modprobe bttv card=113 + $ modprobe dvb-bt8xx $ modprobe dst Useful parameters for verbosity level and debugging the dst module: @@ -74,9 +65,10 @@ DViCO FusionHDTV 5 Lite: 135 Notice: The order of the card ID should be uprising: Example: $ modprobe bttv card=113 card=135 + $ modprobe dvb-bt8xx For a full list of card ID's please see Documentation/video4linux/CARDLIST.bttv. -In case of further problems please subscribe and send questions to the mailing list: linux-dvb@linuxtv.org. +In case of further problems send questions to the mailing list: www.linuxdvb.org. Authors: Richard Walker, Jamie Honan, diff --git a/trunk/Documentation/dvb/get_dvb_firmware b/trunk/Documentation/dvb/get_dvb_firmware index b4d306ae9234..4820366b6ae8 100644 --- a/trunk/Documentation/dvb/get_dvb_firmware +++ b/trunk/Documentation/dvb/get_dvb_firmware @@ -24,8 +24,7 @@ use IO::Handle; @components = ( "sp8870", "sp887x", "tda10045", "tda10046", "tda10046lifeview", "av7110", "dec2000t", "dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004", - "or51211", "or51132_qam", "or51132_vsb", "bluebird", - "opera1"); + "or51211", "or51132_qam", "or51132_vsb", "bluebird"); # Check args syntax() if (scalar(@ARGV) != 1); @@ -57,7 +56,7 @@ syntax(); sub sp8870 { my $sourcefile = "tt_Premium_217g.zip"; - my $url = "http://www.softwarepatch.pl/9999ccd06a4813cb827dbb0005071c71/$sourcefile"; + my $url = "http://www.technotrend.de/new/217g/$sourcefile"; my $hash = "53970ec17a538945a6d8cb608a7b3899"; my $outfile = "dvb-fe-sp8870.fw"; my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1); @@ -211,45 +210,6 @@ sub dec3000s { $outfile; } -sub opera1{ - my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 0); - - checkstandard(); - my $fwfile1="dvb-usb-opera1-fpga-01.fw"; - my $fwfile2="dvb-usb-opera-01.fw"; - extract("2830SCap2.sys", 0x62e8, 55024, "$tmpdir/opera1-fpga.fw"); - extract("2830SLoad2.sys",0x3178,0x3685-0x3178,"$tmpdir/fw1part1"); - extract("2830SLoad2.sys",0x0980,0x3150-0x0980,"$tmpdir/fw1part2"); - delzero("$tmpdir/fw1part1","$tmpdir/fw1part1-1"); - delzero("$tmpdir/fw1part2","$tmpdir/fw1part2-1"); - verify("$tmpdir/fw1part1-1","5e0909858fdf0b5b09ad48b9fe622e70"); - verify("$tmpdir/fw1part2-1","d6e146f321427e931df2c6fcadac37a1"); - verify("$tmpdir/opera1-fpga.fw","0f8133f5e9051f5f3c1928f7e5a1b07d"); - - my $RES1="\x01\x92\x7f\x00\x01\x00"; - my $RES0="\x01\x92\x7f\x00\x00\x00"; - my $DAT1="\x01\x00\xe6\x00\x01\x00"; - my $DAT0="\x01\x00\xe6\x00\x00\x00"; - open FW,">$tmpdir/opera.fw"; - print FW "$RES1"; - print FW "$DAT1"; - print FW "$RES1"; - print FW "$DAT1"; - appendfile(FW,"$tmpdir/fw1part1-1"); - print FW "$RES0"; - print FW "$DAT0"; - print FW "$RES1"; - print FW "$DAT1"; - appendfile(FW,"$tmpdir/fw1part2-1"); - print FW "$RES1"; - print FW "$DAT1"; - print FW "$RES0"; - print FW "$DAT0"; - copy ("$tmpdir/opera1-fpga.fw",$fwfile1); - copy ("$tmpdir/opera.fw",$fwfile2); - - $fwfile1.",".$fwfile2; -} sub vp7041 { my $sourcefile = "2.422.zip"; @@ -480,25 +440,6 @@ sub appendfile { close(INFILE); } -sub delzero{ - my ($infile,$outfile) =@_; - - open INFILE,"<$infile"; - open OUTFILE,">$outfile"; - while (1){ - $rcount=sysread(INFILE,$buf,22); - $len=ord(substr($buf,0,1)); - print OUTFILE substr($buf,0,1); - print OUTFILE substr($buf,2,$len+3); - last if ($rcount<1); - printf OUTFILE "%c",0; -#print $len." ".length($buf)."\n"; - - } - close(INFILE); - close(OUTFILE); -} - sub syntax() { print STDERR "syntax: get_dvb_firmware \n"; print STDERR "Supported components:\n"; diff --git a/trunk/Documentation/dvb/opera-firmware.txt b/trunk/Documentation/dvb/opera-firmware.txt deleted file mode 100644 index 93e784c2607b..000000000000 --- a/trunk/Documentation/dvb/opera-firmware.txt +++ /dev/null @@ -1,27 +0,0 @@ -To extract the firmware for the Opera DVB-S1 USB-Box -you need to copy the files: - -2830SCap2.sys -2830SLoad2.sys - -from the windriver disk into this directory. - -Then run - -./get_dvb_firware opera1 - -and after that you have 2 files: - -dvb-usb-opera-01.fw -dvb-usb-opera1-fpga-01.fw - -in here. - -Copy them into /lib/firmware/ . - -After that the driver can load the firmware -(if you have enabled firmware loading -in kernel config and have hotplug running). - - -Marco Gittler \ No newline at end of file diff --git a/trunk/Documentation/powerpc/booting-without-of.txt b/trunk/Documentation/powerpc/booting-without-of.txt index 76733a3962f0..0c2434822094 100644 --- a/trunk/Documentation/powerpc/booting-without-of.txt +++ b/trunk/Documentation/powerpc/booting-without-of.txt @@ -1250,12 +1250,6 @@ platforms are moved over to use the flattened-device-tree model. network device. This is used by the bootwrapper to interpret MAC addresses passed by the firmware when no information other than indices is available to associate an address with a device. - - phy-connection-type : a string naming the controller/PHY interface type, - i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "sgmii", - "tbi", or "rtbi". This property is only really needed if the connection - is of type "rgmii-id", as all other connection types are detected by - hardware. - Example: diff --git a/trunk/Documentation/video4linux/CARDLIST.bttv b/trunk/Documentation/video4linux/CARDLIST.bttv index 177159c5f4c4..b60639130a51 100644 --- a/trunk/Documentation/video4linux/CARDLIST.bttv +++ b/trunk/Documentation/video4linux/CARDLIST.bttv @@ -66,7 +66,7 @@ 65 -> Lifeview FlyVideo 2000S LR90 66 -> Terratec TValueRadio [153b:1135,153b:ff3b] 67 -> IODATA GV-BCTV4/PCI [10fc:4050] - 68 -> 3Dfx VoodooTV FM (Euro) [10b4:2637] + 68 -> 3Dfx VoodooTV FM (Euro), VoodooTV 200 (USA) [121a:3000,10b4:2637] 69 -> Active Imaging AIMMS 70 -> Prolink Pixelview PV-BT878P+ (Rev.4C,8E) 71 -> Lifeview FlyVideo 98EZ (capture only) LR51 [1851:1851] @@ -145,5 +145,3 @@ 144 -> MagicTV 145 -> SSAI Security Video Interface [4149:5353] 146 -> SSAI Ultrasound Video Interface [414a:5353] -147 -> VoodooTV 200 (USA) [121a:3000] -148 -> DViCO FusionHDTV 2 [dbc0:d200] diff --git a/trunk/Documentation/video4linux/CARDLIST.cx88 b/trunk/Documentation/video4linux/CARDLIST.cx88 index 82ac8250e978..60f838beb9c8 100644 --- a/trunk/Documentation/video4linux/CARDLIST.cx88 +++ b/trunk/Documentation/video4linux/CARDLIST.cx88 @@ -55,4 +55,3 @@ 54 -> Norwood Micro TV Tuner 55 -> Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM [c180:c980] 56 -> Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder [0070:9600,0070:9601,0070:9602] - 57 -> ADS Tech Instant Video PCI [1421:0390] diff --git a/trunk/Documentation/video4linux/CARDLIST.saa7134 b/trunk/Documentation/video4linux/CARDLIST.saa7134 index 3f8aeab50a10..712e8c8333cc 100644 --- a/trunk/Documentation/video4linux/CARDLIST.saa7134 +++ b/trunk/Documentation/video4linux/CARDLIST.saa7134 @@ -114,4 +114,3 @@ 113 -> Elitegroup ECS TVP3XP FM1246 Tuner Card (PAL,FM) [1019:4cb6] 114 -> KWorld DVB-T 210 [17de:7250] 115 -> Sabrent PCMCIA TV-PCB05 [0919:2003] -116 -> 10MOONS TM300 TV Card [1131:2304] diff --git a/trunk/Documentation/video4linux/CARDLIST.tuner b/trunk/Documentation/video4linux/CARDLIST.tuner index a88c02d23805..44134f04b82a 100644 --- a/trunk/Documentation/video4linux/CARDLIST.tuner +++ b/trunk/Documentation/video4linux/CARDLIST.tuner @@ -40,7 +40,7 @@ tuner=38 - Philips PAL/SECAM multi (FM1216ME MK3) tuner=39 - LG NTSC (newer TAPC series) tuner=40 - HITACHI V7-J180AT tuner=41 - Philips PAL_MK (FI1216 MK) -tuner=42 - Philips FCV1236D ATSC/NTSC dual in +tuner=42 - Philips 1236D ATSC/NTSC dual in tuner=43 - Philips NTSC MK3 (FM1236MK3 or FM1236/F) tuner=44 - Philips 4 in 1 (ATI TV Wonder Pro/Conexant) tuner=45 - Microtune 4049 FM5 @@ -72,4 +72,3 @@ tuner=70 - Samsung TCPN 2121P30A tuner=71 - Xceive xc3028 tuner=72 - Thomson FE6600 tuner=73 - Samsung TCPG 6121P30A -tuner=75 - Philips TEA5761 FM Radio diff --git a/trunk/Documentation/video4linux/sn9c102.txt b/trunk/Documentation/video4linux/sn9c102.txt index 1ffad19ce891..279717c96f63 100644 --- a/trunk/Documentation/video4linux/sn9c102.txt +++ b/trunk/Documentation/video4linux/sn9c102.txt @@ -436,7 +436,7 @@ HV7131D Hynix Semiconductor | Yes No No No HV7131R Hynix Semiconductor | No Yes Yes Yes MI-0343 Micron Technology | Yes No No No MI-0360 Micron Technology | No Yes Yes Yes -OV7630 OmniVision Technologies | Yes Yes Yes Yes +OV7630 OmniVision Technologies | Yes Yes No No OV7660 OmniVision Technologies | No No Yes Yes PAS106B PixArt Imaging | Yes No No No PAS202B PixArt Imaging | Yes Yes No No @@ -583,7 +583,6 @@ order): - Bertrik Sikken, who reverse-engineered and documented the Huffman compression algorithm used in the SN9C101, SN9C102 and SN9C103 controllers and implemented the first decoder; -- Ronny Standke for the donation of a webcam; - Mizuno Takafumi for the donation of a webcam; - an "anonymous" donator (who didn't want his name to be revealed) for the donation of a webcam. diff --git a/trunk/Documentation/video4linux/zr364xx.txt b/trunk/Documentation/video4linux/zr364xx.txt index 4d9a0c33f2fd..c76992d0ff4d 100644 --- a/trunk/Documentation/video4linux/zr364xx.txt +++ b/trunk/Documentation/video4linux/zr364xx.txt @@ -62,4 +62,4 @@ Vendor Product Distributor Model 0x0784 0x0040 Traveler Slimline X5 0x06d6 0x0034 Trust Powerc@m 750 0x0a17 0x0062 Pentax Optio 50L -0x06d6 0x003b Trust Powerc@m 970Z + diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index e78f62f13bac..5abec1435ad8 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -913,12 +913,6 @@ M: mchan@broadcom.com L: netdev@vger.kernel.org S: Supported -BSG (block layer generic sg v4 driver) -P: FUJITA Tomonori -M: fujita.tomonori@lab.ntt.co.jp -L: linux-scsi@vger.kernel.org -S: Supported - BTTV VIDEO4LINUX DRIVER P: Mauro Carvalho Chehab M: mchehab@infradead.org @@ -1740,7 +1734,6 @@ S: Maintained i386 SETUP CODE / CPU ERRATA WORKAROUNDS P: H. Peter Anvin M: hpa@zytor.com -T: git.kernel.org:/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup.git S: Maintained IA64 (Itanium) PLATFORM @@ -2394,7 +2387,7 @@ P: Artem Bityutskiy M: dedekind@infradead.org W: http://www.linux-mtd.infradead.org/ L: linux-mtd@lists.infradead.org -T: git git://git.infradead.org/~dedekind/ubi-2.6.git +T: git git://git.infradead.org/ubi-2.6.git S: Maintained MICROTEK X6 SCANNER @@ -4111,11 +4104,6 @@ W: http://www.polyware.nl/~middelin/En/hobbies.html W: http://www.polyware.nl/~middelin/hobbies.html S: Maintained -ZS DECSTATION Z85C30 SERIAL DRIVER -P: Maciej W. Rozycki -M: macro@linux-mips.org -S: Maintained - THE REST P: Linus Torvalds S: Buried alive in reporters diff --git a/trunk/arch/alpha/kernel/smp.c b/trunk/arch/alpha/kernel/smp.c index b28731437c31..80cfb758ee2b 100644 --- a/trunk/arch/alpha/kernel/smp.c +++ b/trunk/arch/alpha/kernel/smp.c @@ -65,7 +65,7 @@ enum ipi_message_type { }; /* Set to a secondary's cpuid when it comes online. */ -static int smp_secondary_alive __devinitdata = 0; +static int smp_secondary_alive __initdata = 0; /* Which cpus ids came online. */ cpumask_t cpu_online_map; @@ -173,7 +173,7 @@ smp_callin(void) } /* Wait until hwrpb->txrdy is clear for cpu. Return -1 on timeout. */ -static int __devinit +static int __init wait_for_txrdy (unsigned long cpumask) { unsigned long timeout; @@ -358,7 +358,7 @@ secondary_cpu_start(int cpuid, struct task_struct *idle) /* * Bring one cpu online. */ -static int __devinit +static int __init smp_boot_one_cpu(int cpuid) { struct task_struct *idle; diff --git a/trunk/arch/alpha/lib/checksum.c b/trunk/arch/alpha/lib/checksum.c index 8698e0746f9f..ab3761c437a8 100644 --- a/trunk/arch/alpha/lib/checksum.c +++ b/trunk/arch/alpha/lib/checksum.c @@ -69,7 +69,6 @@ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, result = (result & 0xffffffff) + (result >> 32); return (__force __wsum)result; } -EXPORT_SYMBOL(csum_tcpudp_nofold); /* * Do a 64-bit checksum on an arbitrary memory area.. diff --git a/trunk/arch/avr32/Kconfig b/trunk/arch/avr32/Kconfig index d12346aaa88b..3ec76586877e 100644 --- a/trunk/arch/avr32/Kconfig +++ b/trunk/arch/avr32/Kconfig @@ -113,10 +113,6 @@ config BOARD_ATNGW100 bool "ATNGW100 Network Gateway" endchoice -if BOARD_ATSTK1000 -source "arch/avr32/boards/atstk1000/Kconfig" -endif - choice prompt "Boot loader type" default LOADER_U_BOOT @@ -189,27 +185,6 @@ config CMDLINE endmenu -menu "Power managment options" - -menu "CPU Frequency scaling" - -source "drivers/cpufreq/Kconfig" - -config CPU_FREQ_AT32AP - bool "CPU frequency driver for AT32AP" - depends on CPU_FREQ && PLATFORM_AT32AP - default n - help - This enables the CPU frequency driver for AT32AP processors. - - For details, take a look in . - - If in doubt, say N. - -endmenu - -endmenu - menu "Bus options" config PCI diff --git a/trunk/arch/avr32/boards/atstk1000/Kconfig b/trunk/arch/avr32/boards/atstk1000/Kconfig deleted file mode 100644 index 71bc7d364fb7..000000000000 --- a/trunk/arch/avr32/boards/atstk1000/Kconfig +++ /dev/null @@ -1,53 +0,0 @@ -# STK1000 customization - -if BOARD_ATSTK1002 - -config BOARD_ATSTK1002_CUSTOM - bool "Non-default STK-1002 jumper settings" - help - You will normally leave the jumpers on the CPU card at their - default settings. If you need to use certain peripherals, - you will need to change some of those jumpers. - -if BOARD_ATSTK1002_CUSTOM - -config BOARD_ATSTK1002_SW1_CUSTOM - bool "SW1: use SSC1 (not SPI0)" - help - This also prevents using the external DAC as an audio interface, - and means you can't initialize the on-board QVGA display. - -config BOARD_ATSTK1002_SW2_CUSTOM - bool "SW2: use IRDA or TIMER0 (not UART-A, MMC/SD, and PS2-A)" - help - If you change this you'll want an updated boot loader putting - the console on UART-C not UART-A. - -config BOARD_ATSTK1002_SW3_CUSTOM - bool "SW3: use TIMER1 (not SSC0 and GCLK)" - help - This also prevents using the external DAC as an audio interface. - -config BOARD_ATSTK1002_SW4_CUSTOM - bool "SW4: use ISI/Camera (not GPIOs, SPI1, and PS2-B)" - help - To use the camera interface you'll need a custom card (on the - PCI-format connector) connect a video sensor. - -config BOARD_ATSTK1002_SW5_CUSTOM - bool "SW5: use MACB1 (not LCDC)" - -config BOARD_ATSTK1002_SW6_CUSTOM - bool "SW6: more GPIOs (not MACB0)" - -endif # custom - -config BOARD_ATSTK1002_SPI1 - bool "Configure SPI1 controller" - depends on !BOARD_ATSTK1002_SW4_CUSTOM - help - All the signals for the second SPI controller are available on - GPIO lines and accessed through the J1 jumper block. Say "y" - here to configure that SPI controller. - -endif # stk 1002 diff --git a/trunk/arch/avr32/boards/atstk1000/atstk1002.c b/trunk/arch/avr32/boards/atstk1000/atstk1002.c index cb93eabb9c6c..e253e86a1a39 100644 --- a/trunk/arch/avr32/boards/atstk1000/atstk1002.c +++ b/trunk/arch/avr32/boards/atstk1000/atstk1002.c @@ -27,27 +27,15 @@ #include "atstk1000.h" +#define SW2_DEFAULT /* MMCI and UART_A available */ struct eth_addr { u8 addr[6]; }; static struct eth_addr __initdata hw_addr[2]; -static struct eth_platform_data __initdata eth_data[2] = { - { - /* - * The MDIO pullups on STK1000 are a bit too weak for - * the autodetection to work properly, so we have to - * mask out everything but the correct address. - */ - .phy_mask = ~(1U << 16), - }, - { - .phy_mask = ~(1U << 17), - }, -}; +static struct eth_platform_data __initdata eth_data[2]; -#ifndef CONFIG_BOARD_ATSTK1002_SW1_CUSTOM static struct spi_board_info spi0_board_info[] __initdata = { { /* QVGA display */ @@ -57,13 +45,6 @@ static struct spi_board_info spi0_board_info[] __initdata = { .mode = SPI_MODE_3, }, }; -#endif - -#ifdef CONFIG_BOARD_ATSTK1002_SPI1 -static struct spi_board_info spi1_board_info[] __initdata = { { - /* patch in custom entries here */ -} }; -#endif /* * The next two functions should go away as the boot loader is @@ -122,10 +103,10 @@ static void __init set_hw_addr(struct platform_device *pdev) void __init setup_board(void) { -#ifdef CONFIG_BOARD_ATSTK1002_SW2_CUSTOM - at32_map_usart(0, 1); /* USART 0/B: /dev/ttyS1, IRDA */ -#else +#ifdef SW2_DEFAULT at32_map_usart(1, 0); /* USART 1/A: /dev/ttyS0, DB9 */ +#else + at32_map_usart(0, 1); /* USART 0/B: /dev/ttyS1, IRDA */ #endif /* USART 2/unused: expansion connector */ at32_map_usart(3, 2); /* USART 3/C: /dev/ttyS2, DB9 */ @@ -159,31 +140,18 @@ static int __init atstk1002_init(void) at32_add_system_devices(); -#ifdef CONFIG_BOARD_ATSTK1002_SW2_CUSTOM - at32_add_device_usart(1); -#else +#ifdef SW2_DEFAULT at32_add_device_usart(0); +#else + at32_add_device_usart(1); #endif at32_add_device_usart(2); -#ifndef CONFIG_BOARD_ATSTK1002_SW6_CUSTOM set_hw_addr(at32_add_device_eth(0, ð_data[0])); -#endif -#ifndef CONFIG_BOARD_ATSTK1002_SW1_CUSTOM + at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info)); -#endif -#ifdef CONFIG_BOARD_ATSTK1002_SPI1 - at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); -#endif -#ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM - set_hw_addr(at32_add_device_eth(1, ð_data[1])); -#else at32_add_device_lcdc(0, &atstk1000_lcdc_data, fbmem_start, fbmem_size); -#endif -#ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM - at32_add_device_ssc(0, ATMEL_SSC_TX); -#endif return 0; } diff --git a/trunk/arch/avr32/kernel/setup.c b/trunk/arch/avr32/kernel/setup.c index d08b0bc6b2bb..b279d66acf5f 100644 --- a/trunk/arch/avr32/kernel/setup.c +++ b/trunk/arch/avr32/kernel/setup.c @@ -313,7 +313,7 @@ __tagtable(ATAG_MEM, parse_tag_mem); static int __init parse_tag_rdimg(struct tag *tag) { -#ifdef CONFIG_BLK_DEV_INITRD +#ifdef CONFIG_INITRD struct tag_mem_range *mem = &tag->u.mem_range; int ret; @@ -323,7 +323,7 @@ static int __init parse_tag_rdimg(struct tag *tag) return 0; } - ret = add_reserved_region(mem->addr, mem->addr + mem->size - 1, + ret = add_reserved_region(mem->start, mem->start + mem->size - 1, "initrd"); if (ret) { printk(KERN_WARNING diff --git a/trunk/arch/avr32/mach-at32ap/Makefile b/trunk/arch/avr32/mach-at32ap/Makefile index a8b445046e3e..f1d395724ac6 100644 --- a/trunk/arch/avr32/mach-at32ap/Makefile +++ b/trunk/arch/avr32/mach-at32ap/Makefile @@ -1,4 +1,3 @@ obj-y += at32ap.o clock.o intc.o extint.o pio.o hsmc.o obj-$(CONFIG_CPU_AT32AP7000) += at32ap7000.o obj-$(CONFIG_CPU_AT32AP7000) += time-tc.o -obj-$(CONFIG_CPU_FREQ_AT32AP) += cpufreq.o diff --git a/trunk/arch/avr32/mach-at32ap/at32ap.c b/trunk/arch/avr32/mach-at32ap/at32ap.c index 7c4987f3287a..90f207e8e96d 100644 --- a/trunk/arch/avr32/mach-at32ap/at32ap.c +++ b/trunk/arch/avr32/mach-at32ap/at32ap.c @@ -11,10 +11,41 @@ #include #include +#include + #include +#include + +struct at32_sm system_manager; + +static int __init at32_sm_init(void) +{ + struct resource *regs; + struct at32_sm *sm = &system_manager; + int ret = -ENXIO; + + regs = platform_get_resource(&at32_sm_device, IORESOURCE_MEM, 0); + if (!regs) + goto fail; + + spin_lock_init(&sm->lock); + sm->pdev = &at32_sm_device; + + ret = -ENOMEM; + sm->regs = ioremap(regs->start, regs->end - regs->start + 1); + if (!sm->regs) + goto fail; + + return 0; + +fail: + printk(KERN_ERR "Failed to initialize System Manager: %d\n", ret); + return ret; +} void __init setup_platform(void) { + at32_sm_init(); at32_clock_init(); at32_portmux_init(); } diff --git a/trunk/arch/avr32/mach-at32ap/at32ap7000.c b/trunk/arch/avr32/mach-at32ap/at32ap7000.c index 64cc5583ddfb..4dda42d3f6d5 100644 --- a/trunk/arch/avr32/mach-at32ap/at32ap7000.c +++ b/trunk/arch/avr32/mach-at32ap/at32ap7000.c @@ -17,20 +17,14 @@ #include #include #include +#include #include