From 42434a4dc974e4917fbaf81946238387c9ee64a5 Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Dec 20 2010 18:15:12 +0000 Subject: Revert "temporarily revert v4l rebase due to issues reported in previous update" This reverts commit 3dbb45b66579bb796d42b92bd9fe1250c46db8ff. --- diff --git a/kernel.spec b/kernel.spec index 3b84d30..4f9bfa7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -48,7 +48,7 @@ Summary: The Linux kernel # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec). # scripts/rebase.sh should be made to do that for you, actually. # -%global baserelease 69 +%global baserelease 68 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2075,11 +2075,6 @@ fi # and build. %changelog -* Sun Dec 19 2010 Kyle McMartin 2.6.35.10-69 -- Revert Jarod's v4l-dvb-ir rebase, due to several issues reported against - the 2.6.35.10-68 update. - https://admin.fedoraproject.org/updates/kernel-2.6.35.10-68.fc14 - * Sat Dec 18 2010 Kyle McMartin - Patch from nhorman against f13: Enhance AF_PACKET to allow non-contiguous buffer alloc (#637619) diff --git a/linux-2.6-v4l-dvb-update.patch b/linux-2.6-v4l-dvb-update.patch index cc30707..21b271a 100644 --- a/linux-2.6-v4l-dvb-update.patch +++ b/linux-2.6-v4l-dvb-update.patch @@ -821,9 +821,10 @@ Generated from http://git.linuxtv.org/media_build.git on 12/14/2010 include/media/wm8775.h | 3 819 files changed, 95654 insertions(+), 32045 deletions(-) --- -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/saa7146_fops.c linux-2.6.35.x86_64.new/drivers/media/common/saa7146_fops.c ---- linux-2.6.35.x86_64/drivers/media/common/saa7146_fops.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/common/saa7146_fops.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/saa7146_fops.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/common/saa7146_fops.c ++++ linux-2.6.35.x86_64/drivers/media/common/saa7146_fops.c @@ -56,8 +56,8 @@ void saa7146_dma_free(struct saa7146_dev BUG_ON(in_interrupt()); @@ -835,9 +836,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/saa7146_fops.c linux-2.6.35 videobuf_dma_free(dma); buf->vb.state = VIDEOBUF_NEEDS_INIT; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/saa7146_i2c.c linux-2.6.35.x86_64.new/drivers/media/common/saa7146_i2c.c ---- linux-2.6.35.x86_64/drivers/media/common/saa7146_i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/common/saa7146_i2c.c 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/saa7146_i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/common/saa7146_i2c.c ++++ linux-2.6.35.x86_64/drivers/media/common/saa7146_i2c.c @@ -391,7 +391,6 @@ static int saa7146_i2c_xfer(struct i2c_a /*****************************************************************************/ @@ -854,9 +856,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/saa7146_i2c.c linux-2.6.35. i2c_adapter->timeout = SAA7146_I2C_TIMEOUT; i2c_adapter->retries = SAA7146_I2C_RETRIES; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/saa7146_vbi.c linux-2.6.35.x86_64.new/drivers/media/common/saa7146_vbi.c ---- linux-2.6.35.x86_64/drivers/media/common/saa7146_vbi.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/common/saa7146_vbi.c 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/saa7146_vbi.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/common/saa7146_vbi.c ++++ linux-2.6.35.x86_64/drivers/media/common/saa7146_vbi.c @@ -375,7 +375,7 @@ static void vbi_init(struct saa7146_dev static int vbi_open(struct saa7146_dev *dev, struct file *file) @@ -884,9 +887,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/saa7146_vbi.c linux-2.6.35. struct saa7146_vv *vv = dev->vv_data; DEB_VBI(("dev:%p, fh:%p\n",dev,fh)); -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/saa7146_video.c linux-2.6.35.x86_64.new/drivers/media/common/saa7146_video.c ---- linux-2.6.35.x86_64/drivers/media/common/saa7146_video.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/common/saa7146_video.c 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/saa7146_video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/common/saa7146_video.c ++++ linux-2.6.35.x86_64/drivers/media/common/saa7146_video.c @@ -1370,7 +1370,7 @@ static void video_init(struct saa7146_de static int video_open(struct saa7146_dev *dev, struct file *file) @@ -914,9 +918,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/saa7146_video.c linux-2.6.3 struct saa7146_vv *vv = dev->vv_data; struct videobuf_queue *q = &fh->video_q; int err; -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/Kconfig linux-2.6.35.x86_64.new/drivers/media/common/tuners/Kconfig ---- linux-2.6.35.x86_64/drivers/media/common/tuners/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/common/tuners/Kconfig 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/tuners/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/common/tuners/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/common/tuners/Kconfig @@ -34,7 +34,7 @@ config MEDIA_TUNER menuconfig MEDIA_TUNER_CUSTOMISE bool "Customize analog and hybrid tuner modules to build" @@ -938,9 +943,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/Kconfig linux-2.6.35 + NXP TDA18218 silicon tuner driver. + endif # MEDIA_TUNER_CUSTOMISE -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/Makefile linux-2.6.35.x86_64.new/drivers/media/common/tuners/Makefile ---- linux-2.6.35.x86_64/drivers/media/common/tuners/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/common/tuners/Makefile 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/tuners/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/common/tuners/Makefile ++++ linux-2.6.35.x86_64/drivers/media/common/tuners/Makefile @@ -24,6 +24,7 @@ obj-$(CONFIG_MEDIA_TUNER_MXL5005S) += mx obj-$(CONFIG_MEDIA_TUNER_MXL5007T) += mxl5007t.o obj-$(CONFIG_MEDIA_TUNER_MC44S803) += mc44s803.o @@ -949,9 +955,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/Makefile linux-2.6.3 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core EXTRA_CFLAGS += -Idrivers/media/dvb/frontends -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/max2165.c linux-2.6.35.x86_64.new/drivers/media/common/tuners/max2165.c ---- linux-2.6.35.x86_64/drivers/media/common/tuners/max2165.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/common/tuners/max2165.c 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/tuners/max2165.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/common/tuners/max2165.c ++++ linux-2.6.35.x86_64/drivers/media/common/tuners/max2165.c @@ -52,13 +52,12 @@ static int max2165_write_reg(struct max2 msg.addr = priv->config->i2c_address; @@ -985,9 +992,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/max2165.c linux-2.6. __func__, reg, b1[0]); return 0; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218.c linux-2.6.35.x86_64.new/drivers/media/common/tuners/tda18218.c ---- linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/common/tuners/tda18218.c 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218.c @@ -0,0 +1,334 @@ +/* + * NXP TDA18218HN silicon tuner driver @@ -1323,9 +1331,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218.c linux-2.6 +MODULE_DESCRIPTION("NXP TDA18218HN silicon tuner driver"); +MODULE_AUTHOR("Antti Palosaari "); +MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218.h linux-2.6.35.x86_64.new/drivers/media/common/tuners/tda18218.h ---- linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/common/tuners/tda18218.h 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218.h @@ -0,0 +1,45 @@ +/* + * NXP TDA18218HN silicon tuner driver @@ -1372,9 +1381,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218.h linux-2.6 +#endif + +#endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218_priv.h linux-2.6.35.x86_64.new/drivers/media/common/tuners/tda18218_priv.h ---- linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218_priv.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/common/tuners/tda18218_priv.h 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218_priv.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218_priv.h @@ -0,0 +1,106 @@ +/* + * NXP TDA18218HN silicon tuner driver @@ -1482,9 +1492,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tda18218_priv.h linu +}; + +#endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271-common.c linux-2.6.35.x86_64.new/drivers/media/common/tuners/tda18271-common.c ---- linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271-common.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/common/tuners/tda18271-common.c 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271-common.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/common/tuners/tda18271-common.c ++++ linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271-common.c @@ -193,25 +193,51 @@ int tda18271_write_regs(struct dvb_front unsigned char *regs = priv->tda18271_regs; unsigned char buf[TDA18271_NUM_REGS + 1]; @@ -1572,9 +1583,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271-common.c li /* setup agc1 gain */ regs[R_EB17] = 0x00; -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271-fe.c linux-2.6.35.x86_64.new/drivers/media/common/tuners/tda18271-fe.c ---- linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271-fe.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/common/tuners/tda18271-fe.c 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271-fe.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/common/tuners/tda18271-fe.c ++++ linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271-fe.c @@ -1156,7 +1156,6 @@ static int tda18271_get_id(struct dvb_fr struct tda18271_priv *priv = fe->tuner_priv; unsigned char *regs = priv->tda18271_regs; @@ -1632,9 +1644,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271-fe.c linux- goto fail; mutex_lock(&priv->lock); -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271.h linux-2.6.35.x86_64.new/drivers/media/common/tuners/tda18271.h ---- linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/common/tuners/tda18271.h 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/common/tuners/tda18271.h ++++ linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271.h @@ -80,8 +80,9 @@ enum tda18271_output_options { enum tda18271_small_i2c { @@ -1647,9 +1660,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tda18271.h linux-2.6 }; struct tda18271_config { -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tuner-simple.c linux-2.6.35.x86_64.new/drivers/media/common/tuners/tuner-simple.c ---- linux-2.6.35.x86_64/drivers/media/common/tuners/tuner-simple.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/common/tuners/tuner-simple.c 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/tuners/tuner-simple.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/common/tuners/tuner-simple.c ++++ linux-2.6.35.x86_64/drivers/media/common/tuners/tuner-simple.c @@ -546,14 +546,11 @@ static int simple_set_tv_freq(struct dvb struct tuner_simple_priv *priv = fe->tuner_priv; u8 config, cb; @@ -1665,9 +1679,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/tuner-simple.c linux /* IFPCoff = Video Intermediate Frequency - Vif: 940 =16*58.75 NTSC/J (Japan) 732 =16*45.75 M/N STD -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/xc5000.c linux-2.6.35.x86_64.new/drivers/media/common/tuners/xc5000.c ---- linux-2.6.35.x86_64/drivers/media/common/tuners/xc5000.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/common/tuners/xc5000.c 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/tuners/xc5000.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/common/tuners/xc5000.c ++++ linux-2.6.35.x86_64/drivers/media/common/tuners/xc5000.c @@ -217,6 +217,7 @@ static int xc_send_i2c_data(struct xc500 return XC_RESULT_SUCCESS; } @@ -1766,9 +1781,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/xc5000.c linux-2.6.3 { struct xc5000_priv *priv = NULL; int instance; -diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/xc5000.h linux-2.6.35.x86_64.new/drivers/media/common/tuners/xc5000.h ---- linux-2.6.35.x86_64/drivers/media/common/tuners/xc5000.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/common/tuners/xc5000.h 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/common/tuners/xc5000.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/common/tuners/xc5000.h ++++ linux-2.6.35.x86_64/drivers/media/common/tuners/xc5000.h @@ -53,11 +53,11 @@ struct xc5000_config { (defined(CONFIG_MEDIA_TUNER_XC5000_MODULE) && defined(MODULE)) extern struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, @@ -1783,9 +1799,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/common/tuners/xc5000.h linux-2.6.3 { printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); return NULL; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/b2c2/flexcop-i2c.c linux-2.6.35.x86_64.new/drivers/media/dvb/b2c2/flexcop-i2c.c ---- linux-2.6.35.x86_64/drivers/media/dvb/b2c2/flexcop-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/b2c2/flexcop-i2c.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/b2c2/flexcop-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/b2c2/flexcop-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/b2c2/flexcop-i2c.c @@ -245,9 +245,6 @@ int flexcop_i2c_init(struct flexcop_devi i2c_set_adapdata(&fc->fc_i2c_adap[1].i2c_adap, &fc->fc_i2c_adap[1]); i2c_set_adapdata(&fc->fc_i2c_adap[2].i2c_adap, &fc->fc_i2c_adap[2]); @@ -1796,9 +1813,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/b2c2/flexcop-i2c.c linux-2.6.3 fc->fc_i2c_adap[0].i2c_adap.algo = fc->fc_i2c_adap[1].i2c_adap.algo = fc->fc_i2c_adap[2].i2c_adap.algo = &flexcop_algo; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/b2c2/flexcop-pci.c linux-2.6.35.x86_64.new/drivers/media/dvb/b2c2/flexcop-pci.c ---- linux-2.6.35.x86_64/drivers/media/dvb/b2c2/flexcop-pci.c 2010-12-15 10:51:23.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/b2c2/flexcop-pci.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/b2c2/flexcop-pci.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/b2c2/flexcop-pci.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/b2c2/flexcop-pci.c @@ -39,7 +39,6 @@ MODULE_PARM_DESC(debug, #define DRIVER_VERSION "0.1" @@ -1825,9 +1843,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/b2c2/flexcop-pci.c linux-2.6.3 goto err_pci_iounmap; fc_pci->init_state |= FC_PCI_INIT; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/bt8xx/dst.c linux-2.6.35.x86_64.new/drivers/media/dvb/bt8xx/dst.c ---- linux-2.6.35.x86_64/drivers/media/dvb/bt8xx/dst.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/bt8xx/dst.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/bt8xx/dst.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/bt8xx/dst.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/bt8xx/dst.c @@ -1763,7 +1763,15 @@ static struct dvb_frontend_ops dst_dvbt_ .frequency_min = 137000000, .frequency_max = 858000000, @@ -1845,9 +1864,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/bt8xx/dst.c linux-2.6.35.x86_6 }, .release = dst_release, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/bt8xx/dst_ca.c linux-2.6.35.x86_64.new/drivers/media/dvb/bt8xx/dst_ca.c ---- linux-2.6.35.x86_64/drivers/media/dvb/bt8xx/dst_ca.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/bt8xx/dst_ca.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/bt8xx/dst_ca.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/bt8xx/dst_ca.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/bt8xx/dst_ca.c @@ -22,7 +22,7 @@ #include #include @@ -1885,9 +1905,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/bt8xx/dst_ca.c linux-2.6.35.x8 return result; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dm1105/dm1105.c linux-2.6.35.x86_64.new/drivers/media/dvb/dm1105/dm1105.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dm1105/dm1105.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dm1105/dm1105.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dm1105/dm1105.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dm1105/dm1105.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dm1105/dm1105.c @@ -26,9 +26,8 @@ #include #include @@ -1991,9 +2012,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dm1105/dm1105.c linux-2.6.35.x dev->i2c_adap.dev.parent = &pdev->dev; dev->i2c_adap.algo = &dm1105_algo; dev->i2c_adap.algo_data = dev; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dm1105/Kconfig linux-2.6.35.x86_64.new/drivers/media/dvb/dm1105/Kconfig ---- linux-2.6.35.x86_64/drivers/media/dvb/dm1105/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dm1105/Kconfig 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dm1105/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dm1105/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/dvb/dm1105/Kconfig @@ -1,7 +1,6 @@ config DVB_DM1105 tristate "SDMC DM1105 based PCI cards" @@ -2011,9 +2033,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dm1105/Kconfig linux-2.6.35.x8 help Support for cards based on the SDMC DM1105 PCI chip like DvbWorld 2002 -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dmxdev.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dmxdev.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dmxdev.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dmxdev.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dmxdev.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-core/dmxdev.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dmxdev.c @@ -25,7 +25,6 @@ #include #include @@ -2061,9 +2084,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dmxdev.c linux-2.6.35 } static unsigned int dvb_dvr_poll(struct file *file, poll_table *wait) -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dvb_ca_en50221.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-core/dvb_ca_en50221.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_ca_en50221.c @@ -1259,13 +1259,7 @@ static int dvb_ca_en50221_io_do_ioctl(st static long dvb_ca_en50221_io_ioctl(struct file *file, unsigned int cmd, unsigned long arg) @@ -2105,9 +2129,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linu status = pktlen; exit: -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_demux.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dvb_demux.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_demux.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dvb_demux.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_demux.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-core/dvb_demux.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_demux.c @@ -1130,13 +1130,9 @@ static int dvbdmx_write(struct dmx_demux if ((!demux->frontend) || (demux->frontend->source != DMX_MEMORY_FE)) return -EINVAL; @@ -2125,9 +2150,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_demux.c linux-2.6 if (mutex_lock_interruptible(&dvbdemux->mutex)) { kfree(p); return -ERESTARTSYS; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dvbdev.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dvbdev.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvbdev.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-core/dvbdev.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvbdev.c @@ -32,9 +32,9 @@ #include #include @@ -2195,9 +2221,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.35 if (err < 0) goto out; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_frontend.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dvb_frontend.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_frontend.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dvb_frontend.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_frontend.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-core/dvb_frontend.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -465,7 +465,7 @@ static void dvb_frontend_swzigzag(struct if ((fepriv->state & FESTATE_SEARCHING_FAST) || (fepriv->state & FESTATE_RETUNE)) { fepriv->delay = fepriv->min_delay; @@ -2261,9 +2288,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_frontend.c linux- init_waitqueue_head (&fepriv->wait_queue); init_waitqueue_head (&fepriv->events.wait_queue); mutex_init(&fepriv->events.mtx); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_frontend.h linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dvb_frontend.h ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_frontend.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dvb_frontend.h 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_frontend.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-core/dvb_frontend.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_frontend.h @@ -260,7 +260,7 @@ struct dvb_frontend_ops { int (*init)(struct dvb_frontend* fe); int (*sleep)(struct dvb_frontend* fe); @@ -2273,9 +2301,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_frontend.h linux- /* if this is set, it overrides the default swzigzag */ int (*tune)(struct dvb_frontend* fe, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_net.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dvb_net.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_net.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-core/dvb_net.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_net.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-core/dvb_net.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_net.c @@ -59,7 +59,6 @@ #include #include @@ -2299,9 +2328,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-core/dvb_net.c linux-2.6.3 } static int dvb_net_close(struct inode *inode, struct file *file) -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/a800.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/a800.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/a800.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/a800.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/a800.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/a800.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/a800.c @@ -37,7 +37,7 @@ static int a800_identify_state(struct us return 0; } @@ -2328,9 +2358,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/a800.c linux-2.6.35.x8 .i2c_algo = &dibusb_i2c_algo, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/af9005.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/af9005.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/af9005.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005.c @@ -54,50 +54,6 @@ struct af9005_device_state { int led_state; }; @@ -2470,9 +2501,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005.c linux-2.6.35. /* deregister this driver from the USB subsystem */ usb_deregister(&af9005_usb_driver); } -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005.h linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/af9005.h ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/af9005.h 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/af9005.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005.h @@ -3490,7 +3490,7 @@ extern u8 regmask[8]; /* remote control decoder */ extern int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, @@ -2483,9 +2515,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005.h linux-2.6.35. +extern int rc_map_af9005_table_size; #endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005-remote.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/af9005-remote.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005-remote.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/af9005-remote.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005-remote.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/af9005-remote.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005-remote.c @@ -33,7 +33,7 @@ MODULE_PARM_DESC(debug, #define deb_decode(args...) dprintk(dvb_usb_af9005_remote_debug,0x01,args) @@ -2530,9 +2563,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9005-remote.c linux- EXPORT_SYMBOL(af9005_rc_decode); MODULE_AUTHOR("Luca Olivetti "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9015.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/af9015.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9015.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/af9015.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9015.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/af9015.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9015.c @@ -31,6 +31,8 @@ #include "tda18271.h" #include "mxl5005s.h" @@ -3178,9 +3212,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9015.c linux-2.6.35. /* remove 2nd I2C adapter */ if (d != NULL && d->desc != NULL) -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9015.h linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/af9015.h ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9015.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/af9015.h 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9015.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/af9015.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9015.h @@ -100,6 +100,8 @@ enum af9015_ir_mode { struct af9015_state { @@ -3935,9 +3970,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/af9015.h linux-2.6.35. -}; - #endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/anysee.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/anysee.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/anysee.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/anysee.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/anysee.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/anysee.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/anysee.c @@ -354,7 +354,7 @@ static int anysee_frontend_attach(struct static int anysee_tuner_attach(struct dvb_usb_adapter *adap) { @@ -4083,9 +4119,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/anysee.c linux-2.6.35. .i2c_algo = &anysee_i2c_algo, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/az6027.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/az6027.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/az6027.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/az6027.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/az6027.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/az6027.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/az6027.c @@ -386,7 +386,7 @@ static int az6027_streaming_ctrl(struct } @@ -4113,9 +4150,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/az6027.c linux-2.6.35. .i2c_algo = &az6027_i2c_algo, .num_device_descs = 5, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/cinergyT2-core.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/cinergyT2-core.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/cinergyT2-core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/cinergyT2-core.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/cinergyT2-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/cinergyT2-core.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/cinergyT2-core.c @@ -84,7 +84,7 @@ static int cinergyt2_frontend_attach(str return 0; } @@ -4142,9 +4180,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/cinergyT2-core.c linux .generic_bulk_ctrl_endpoint = 1, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/cxusb.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/cxusb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/cxusb.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/cxusb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/cxusb.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/cxusb.c @@ -385,7 +385,7 @@ static int cxusb_d680_dmb_streaming_ctrl static int cxusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state) @@ -4426,9 +4465,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.35.x .num_device_descs = 1, .devices = { -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dib0700_core.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700_core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dib0700_core.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700_core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dib0700_core.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700_core.c @@ -13,10 +13,6 @@ int dvb_usb_dib0700_debug; module_param_named(debug,dvb_usb_dib0700_debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info,2=fw,4=fwdata,8=data (or-able))." DVB_USB_DEBUG_STATUS); @@ -4878,9 +4918,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2 dib0700_rc_setup(dev); return 0; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700_devices.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dib0700_devices.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700_devices.c 2010-12-15 10:51:22.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dib0700_devices.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700_devices.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dib0700_devices.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700_devices.c @@ -473,16 +473,19 @@ static u8 rc_request[] = { REQUEST_POLL_ /* Number of keypresses to ignore before start repeating */ #define RC_REPEAT_DELAY 6 @@ -5617,9 +5658,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700_devices.c linu }, }; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700.h linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dib0700.h ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dib0700.h 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dib0700.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700.h @@ -60,6 +60,7 @@ extern int dib0700_streaming_ctrl(struct extern struct i2c_algorithm dib0700_i2c_algo; extern int dib0700_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props, @@ -5628,9 +5670,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dib0700.h linux-2.6.35 extern int dib0700_device_count; extern int dvb_usb_dib0700_ir_proto; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-common.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dibusb-common.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-common.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dibusb-common.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-common.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dibusb-common.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-common.c @@ -327,7 +327,7 @@ EXPORT_SYMBOL(dibusb_dib3000mc_tuner_att /* * common remote control stuff @@ -5649,9 +5692,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-common.c linux- int dibusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state) { -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb.h linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dibusb.h ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dibusb.h 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dibusb.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb.h @@ -124,7 +124,7 @@ extern int dibusb2_0_power_ctrl(struct d #define DEFAULT_RC_INTERVAL 150 //#define DEFAULT_RC_INTERVAL 100000 @@ -5661,9 +5705,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb.h linux-2.6.35. extern int dibusb_rc_query(struct dvb_usb_device *, u32 *, int *); extern int dibusb_read_eeprom_byte(struct dvb_usb_device *, u8, u8 *); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-mb.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dibusb-mb.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-mb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dibusb-mb.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-mb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dibusb-mb.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-mb.c @@ -211,10 +211,12 @@ static struct dvb_usb_device_properties .power_ctrl = dibusb_power_ctrl, @@ -5732,9 +5777,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-mb.c linux-2.6. .i2c_algo = &dibusb_i2c_algo, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-mc.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dibusb-mc.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-mc.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dibusb-mc.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-mc.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dibusb-mc.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-mc.c @@ -81,10 +81,12 @@ static struct dvb_usb_device_properties }, .power_ctrl = dibusb2_0_power_ctrl, @@ -5752,9 +5798,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dibusb-mc.c linux-2.6. .i2c_algo = &dibusb_i2c_algo, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/digitv.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/digitv.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/digitv.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/digitv.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/digitv.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/digitv.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/digitv.c @@ -161,7 +161,7 @@ static int digitv_tuner_attach(struct dv return 0; } @@ -5796,9 +5843,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/digitv.c linux-2.6.35. .i2c_algo = &digitv_i2c_algo, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dtt200u.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dtt200u.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dtt200u.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dtt200u.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dtt200u.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dtt200u.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dtt200u.c @@ -57,7 +57,7 @@ static int dtt200u_pid_filter(struct dvb /* remote control */ @@ -5876,9 +5924,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dtt200u.c linux-2.6.35 .generic_bulk_ctrl_endpoint = 0x01, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb.h linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dvb-usb.h ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dvb-usb.h 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dvb-usb.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb.h @@ -14,6 +14,7 @@ #include #include @@ -6035,9 +6084,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb.h linux-2.6.35 char rc_phys[64]; struct delayed_work rc_query_work; u32 last_event; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c @@ -20,7 +20,6 @@ int dvb_usb_i2c_init(struct dvb_usb_devi } @@ -6046,9 +6096,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c linux-2. d->i2c_adap.algo = d->props.i2c_algo; d->i2c_adap.algo_data = NULL; d->i2c_adap.dev.parent = &d->udev->dev; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-ids.h linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dvb-usb-ids.h ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dvb-usb-ids.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-ids.h @@ -32,6 +32,7 @@ #define USB_VID_EMPIA 0xeb1a #define USB_VID_GENPIX 0x09c0 @@ -6092,9 +6143,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-ids.h linux-2. #define USB_PID_SIGMATEK_DVB_110 0x6610 #define USB_PID_MSI_DIGI_VOX_MINI_II 0x1513 #define USB_PID_MSI_DIGIVOX_DUO 0x8801 -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-init.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dvb-usb-init.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-init.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dvb-usb-init.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-init.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dvb-usb-init.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-init.c @@ -15,7 +15,7 @@ /* debug */ @@ -6308,9 +6360,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-init.c linux-2 } EXPORT_SYMBOL(dvb_usb_device_exit); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-remote.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dvb-usb-remote.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-remote.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dvb-usb-remote.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-remote.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dvb-usb-remote.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-remote.c @@ -8,29 +8,29 @@ #include "dvb-usb-common.h" #include @@ -6640,9 +6693,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dvb-usb-remote.c linux *state = REMOTE_KEY_PRESSED; return 0; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dw2102.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dw2102.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dw2102.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/dw2102.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dw2102.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/dw2102.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dw2102.c @@ -73,8 +73,8 @@ "Please see linux/Documentation/dvb/ for more details " \ "on firmware-problems." @@ -6814,9 +6868,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/dw2102.c linux-2.6.35. p7500->adapter->frontend_attach = prof_7500_frontend_attach; if (0 == dvb_usb_device_init(intf, &dw2102_properties, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/friio-fe.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/friio-fe.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/friio-fe.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/friio-fe.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/friio-fe.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/friio-fe.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/friio-fe.c @@ -75,7 +75,7 @@ static int jdvbt90502_single_reg_write(s return 0; } @@ -6826,9 +6881,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/friio-fe.c linux-2.6.3 { struct jdvbt90502_state *state = fe->demodulator_priv; int err, i; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/gp8psk.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/gp8psk.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/gp8psk.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk.c @@ -24,6 +24,33 @@ MODULE_PARM_DESC(debug, "set debugging l DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); @@ -6907,9 +6963,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk.c linux-2.6.35. +MODULE_DESCRIPTION("Driver for Genpix DVB-S"); MODULE_VERSION("1.1"); MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk-fe.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/gp8psk-fe.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk-fe.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/gp8psk-fe.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk-fe.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/gp8psk-fe.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk-fe.c @@ -109,7 +109,7 @@ static int gp8psk_fe_read_signal_strengt static int gp8psk_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune) @@ -6937,9 +6994,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk-fe.c linux-2.6. }, .release = gp8psk_fe_release, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk.h linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/gp8psk.h ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/gp8psk.h 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/gp8psk.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk.h @@ -25,7 +25,6 @@ extern int dvb_usb_gp8psk_debug; #define deb_xfer(args...) dprintk(dvb_usb_gp8psk_debug,0x02,args) #define deb_rc(args...) dprintk(dvb_usb_gp8psk_debug,0x04,args) @@ -6971,9 +7029,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/gp8psk.h linux-2.6.35. extern struct dvb_frontend * gp8psk_fe_attach(struct dvb_usb_device *d); extern int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen); extern int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/Kconfig linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/Kconfig ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/Kconfig 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/Kconfig @@ -1,6 +1,6 @@ config DVB_USB tristate "Support for various USB DVB devices" @@ -7005,9 +7064,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/Kconfig linux-2.6.35.x + select DVB_IX2505V if !DVB_FE_CUSTOMISE + help + Say Y here to support the LME DM04/QQBOX DVB-S USB2.0 . -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/lmedm04.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/lmedm04.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/lmedm04.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/lmedm04.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/lmedm04.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/lmedm04.c @@ -0,0 +1,1074 @@ +/* DVB USB compliant linux driver for + * @@ -8083,9 +8143,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/lmedm04.c linux-2.6.35 +MODULE_DESCRIPTION("LM2510(C) DVB-S USB2.0"); +MODULE_VERSION("1.71"); +MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/lmedm04.h linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/lmedm04.h ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/lmedm04.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/lmedm04.h 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/lmedm04.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/lmedm04.h @@ -0,0 +1,173 @@ +/* DVB USB compliant linux driver for + * @@ -8260,9 +8321,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/lmedm04.h linux-2.6.35 + 0xff, 0xff, +}; +#endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/m920x.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/m920x.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/m920x.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/m920x.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/m920x.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/m920x.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/m920x.c @@ -69,7 +69,7 @@ static int m920x_init(struct dvb_usb_dev int adap_enabled[M9206_MAX_ADAPTERS] = { 0 }; @@ -8363,9 +8425,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/m920x.c linux-2.6.35.x .size_of_priv = sizeof(struct m920x_state), -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/Makefile linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/Makefile ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/Makefile 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/Makefile ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/Makefile @@ -88,6 +88,9 @@ obj-$(CONFIG_DVB_USB_EC168) += dvb-usb-e dvb-usb-az6027-objs = az6027.o obj-$(CONFIG_DVB_USB_AZ6027) += dvb-usb-az6027.o @@ -8376,9 +8439,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/Makefile linux-2.6.35. EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ # due to tuner-xc3028 EXTRA_CFLAGS += -Idrivers/media/common/tuners -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/nova-t-usb2.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/nova-t-usb2.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/nova-t-usb2.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/nova-t-usb2.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/nova-t-usb2.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/nova-t-usb2.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/nova-t-usb2.c @@ -21,7 +21,7 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr #define deb_ee(args...) dprintk(debug,0x02,args) @@ -8426,9 +8490,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/nova-t-usb2.c linux-2. .i2c_algo = &dibusb_i2c_algo, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/opera1.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/opera1.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/opera1.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/opera1.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/opera1.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/opera1.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/opera1.c @@ -35,7 +35,7 @@ struct opera1_state { u32 last_key_pressed; @@ -8492,9 +8557,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/opera1.c linux-2.6.35. .read_mac_address = opera1_read_mac_address, .generic_bulk_ctrl_endpoint = 0x00, /* parameter for the MPEG2-data transfer */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/vp702x.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/vp702x.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/vp702x.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/vp702x.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/vp702x.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/vp702x.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/vp702x.c @@ -174,7 +174,7 @@ static int vp702x_streaming_ctrl(struct } @@ -8535,9 +8601,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/vp702x.c linux-2.6.35. .num_device_descs = 1, .devices = { -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/vp7045.c linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/vp7045.c ---- linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/vp7045.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/dvb-usb/vp7045.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/vp7045.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/dvb-usb/vp7045.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/vp7045.c @@ -99,7 +99,7 @@ static int vp7045_power_ctrl(struct dvb_ /* The keymapping struct. Somehow this should be loaded to the driver, but @@ -8578,9 +8645,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/dvb-usb/vp7045.c linux-2.6.35. .num_device_descs = 2, .devices = { -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-avc.c linux-2.6.35.x86_64.new/drivers/media/dvb/firewire/firedtv-avc.c ---- linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-avc.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/firewire/firedtv-avc.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-avc.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/firewire/firedtv-avc.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-avc.c @@ -24,6 +24,8 @@ #include #include @@ -8677,9 +8745,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-avc.c linux-2 *len = app_info[3] + 4; out: mutex_unlock(&fdtv->avc_mutex); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-fe.c linux-2.6.35.x86_64.new/drivers/media/dvb/firewire/firedtv-fe.c ---- linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-fe.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/firewire/firedtv-fe.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-fe.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/firewire/firedtv-fe.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-fe.c @@ -155,6 +155,16 @@ static int fdtv_get_frontend(struct dvb_ return -EOPNOTSUPP; } @@ -8751,9 +8820,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-fe.c linux-2. case FIREDTV_DVB_C: fi->type = FE_QAM; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-fw.c linux-2.6.35.x86_64.new/drivers/media/dvb/firewire/firedtv-fw.c ---- linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-fw.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/firewire/firedtv-fw.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-fw.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/firewire/firedtv-fw.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-fw.c @@ -193,9 +193,9 @@ static const struct firedtv_backend back }; @@ -8767,9 +8837,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/firewire/firedtv-fw.c linux-2. { struct firedtv *f, *fdtv = NULL; struct fw_device *device; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/af9013.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/af9013.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/af9013.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013.c @@ -1,5 +1,5 @@ /* - * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver @@ -9219,9 +9290,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013.c linux-2.6.3 /* settings for mp2if */ if (state->config.output_mode == AF9013_OUTPUT_MODE_USB) { -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013.h linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/af9013.h ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/af9013.h 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/af9013.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013.h @@ -1,5 +1,5 @@ /* - * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver @@ -9237,9 +9309,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013.h linux-2.6.3 AF9013_TUNER_TDA18218 = 179, /* NXP */ }; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013_priv.h linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/af9013_priv.h ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013_priv.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/af9013_priv.h 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013_priv.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/af9013_priv.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013_priv.h @@ -1,5 +1,5 @@ /* - * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver @@ -9363,9 +9436,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/af9013_priv.h linux- static struct regdesc tuner_init_tda18271[] = { { 0x9bd5, 0, 8, 0x01 }, { 0x9bd6, 0, 8, 0x04 }, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/atbm8830.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/atbm8830.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/atbm8830.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/atbm8830.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/atbm8830.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/atbm8830.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/atbm8830.c @@ -50,8 +50,7 @@ static int atbm8830_write_reg(struct atb msg2.addr = dev_addr; @@ -9395,9 +9469,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/atbm8830.c linux-2.6 __func__, reg, buf2[0]); return 0; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/au8522_decoder.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/au8522_decoder.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/au8522_decoder.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/au8522_decoder.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/au8522_decoder.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/au8522_decoder.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/au8522_decoder.c @@ -36,7 +36,6 @@ #include #include @@ -9544,9 +9619,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/au8522_decoder.c lin + +module_init(init_au8522); +module_exit(exit_au8522); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/au8522_priv.h linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/au8522_priv.h ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/au8522_priv.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/au8522_priv.h 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/au8522_priv.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/au8522_priv.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/au8522_priv.h @@ -397,7 +397,9 @@ void au8522_release_state(struct au8522_ #define AU8522_TVDEC_COMB_HDIF_THR2_REG06AH_CVBS 0x0A #define AU8522_TVDEC_COMB_HDIF_THR3_REG06BH_CVBS 0x32 @@ -9557,9 +9633,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/au8522_priv.h linux- #define AU8522_TVDEC_COMB_DCDIF_THR3_REG06EH_CVBS 0x6E #define AU8522_TVDEC_UV_SEP_THR_REG06FH_CVBS 0x0F #define AU8522_TVDEC_COMB_DC_THR1_NTSC_REG070H_CVBS 0x80 -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx22702.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/cx22702.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx22702.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/cx22702.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx22702.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/cx22702.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx22702.c @@ -54,7 +54,7 @@ MODULE_PARM_DESC(debug, "Enable verbose #define dprintk if (debug) printk @@ -9869,9 +9946,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx22702.c linux-2.6. .info = { .name = "Conexant CX22702 DVB-T", -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx24110.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/cx24110.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx24110.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/cx24110.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx24110.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/cx24110.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx24110.c @@ -310,7 +310,7 @@ static int cx24110_set_symbolrate (struc } @@ -9881,9 +9959,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx24110.c linux-2.6. { struct cx24110_state *state = fe->demodulator_priv; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx24123.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/cx24123.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx24123.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/cx24123.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx24123.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/cx24123.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx24123.c @@ -1108,7 +1108,6 @@ struct dvb_frontend *cx24123_attach(cons strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus", @@ -9892,9 +9971,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/cx24123.c linux-2.6. state->tuner_i2c_adapter.algo = &cx24123_tuner_i2c_algo; state->tuner_i2c_adapter.algo_data = NULL; i2c_set_adapdata(&state->tuner_i2c_adapter, state); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mb.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/dib3000mb.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/dib3000mb.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/dib3000mb.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mb.c @@ -38,11 +38,10 @@ #define DRIVER_DESC "DiBcom 3000M-B DVB-T demodulator" #define DRIVER_AUTHOR "Patrick Boettcher, patrick.boettcher@desy.de" @@ -9921,9 +10001,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mb.c linux-2. static int dib3000_read_reg(struct dib3000_state *state, u16 reg) { u8 wb[] = { ((reg >> 8) | 0x80) & 0xff, reg & 0xff }; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mb_priv.h linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/dib3000mb_priv.h ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mb_priv.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/dib3000mb_priv.h 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mb_priv.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/dib3000mb_priv.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mb_priv.h @@ -37,12 +37,8 @@ /* debug */ @@ -9937,9 +10018,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mb_priv.h lin /* mask for enabling a specific pid for the pid_filter */ #define DIB3000_ACTIVATE_PID_FILTERING (0x2000) -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mc.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/dib3000mc.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mc.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/dib3000mc.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mc.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/dib3000mc.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mc.c @@ -822,7 +822,7 @@ int dib3000mc_i2c_enumeration(struct i2c dmcst = kzalloc(sizeof(struct dib3000mc_state), GFP_KERNEL); @@ -9949,9 +10031,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib3000mc.c linux-2. dmcst->i2c_adap = i2c; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib7000p.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/dib7000p.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib7000p.c 2010-12-15 10:51:22.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/dib7000p.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib7000p.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/dib7000p.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib7000p.c @@ -260,6 +260,7 @@ static void dib7000p_set_adc_state(struc // dprintk( "908: %x, 909: %x\n", reg_908, reg_909); @@ -9972,9 +10055,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib7000p.c linux-2.6 /* deactive the possibility of diversity reception if extended interleaver */ state->div_force_off = !1 && ch->u.ofdm.transmission_mode != TRANSMISSION_MODE_8K; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib7000p.h linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/dib7000p.h ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib7000p.h 2010-12-15 10:51:22.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/dib7000p.h 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib7000p.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/dib7000p.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib7000p.h @@ -33,8 +33,10 @@ struct dib7000p_config { int (*agc_control) (struct dvb_frontend *, u8 before); @@ -9986,9 +10070,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/dib7000p.h linux-2.6 }; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/dibx000_common.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/dibx000_common.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/dibx000_common.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/dibx000_common.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/dibx000_common.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/dibx000_common.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/dibx000_common.c @@ -130,7 +130,7 @@ static int i2c_adapter_init(struct i2c_a struct dibx000_i2c_master *mst) { @@ -9998,9 +10083,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/dibx000_common.c lin i2c_adap->algo_data = NULL; i2c_set_adapdata(i2c_adap, mst); if (i2c_add_adapter(i2c_adap) < 0) -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/drx397xD.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/drx397xD.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/drx397xD.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/drx397xD.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/drx397xD.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/drx397xD.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/drx397xD.c @@ -232,7 +232,7 @@ static int write_fw(struct drx397xD_stat exit_rc: read_unlock(&fw[s->chip_rev].lock); @@ -10010,9 +10096,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/drx397xD.c linux-2.6 } /* Function is not endian safe, use the RD16 wrapper below */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/ix2505v.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/ix2505v.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/ix2505v.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/ix2505v.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/ix2505v.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/ix2505v.c @@ -0,0 +1,323 @@ +/** + * Driver for Sharp IX2505V (marked B0017) DVB-S silicon tuner @@ -10337,9 +10424,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/ix2505v.c linux-2.6. +MODULE_DESCRIPTION("DVB IX2505V tuner driver"); +MODULE_AUTHOR("Malcolm Priestley"); +MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/ix2505v.h linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/ix2505v.h ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/ix2505v.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/ix2505v.h 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/ix2505v.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/ix2505v.h @@ -0,0 +1,64 @@ +/** + * Driver for Sharp IX2505V (marked B0017) DVB-S silicon tuner @@ -10405,9 +10493,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/ix2505v.h linux-2.6. +#endif + +#endif /* DVB_IX2505V_H */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/Kconfig linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/Kconfig ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/Kconfig 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/Kconfig @@ -1,7 +1,7 @@ config DVB_FE_CUSTOMISE bool "Customise the frontend modules to build" @@ -10495,9 +10584,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/Kconfig linux-2.6.35 comment "Tools to develop new frontends" config DVB_DUMMY_FE -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgdt3305.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/lgdt3305.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgdt3305.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/lgdt3305.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgdt3305.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/lgdt3305.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgdt3305.c @@ -1,7 +1,9 @@ /* - * Support for LGDT3305 - VSB/QAM @@ -10855,9 +10945,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgdt3305.c linux-2.6 /* * Local variables: -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgdt3305.h linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/lgdt3305.h ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgdt3305.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/lgdt3305.h 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgdt3305.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/lgdt3305.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgdt3305.h @@ -1,7 +1,7 @@ /* - * Support for LGDT3305 - VSB/QAM @@ -10888,9 +10979,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgdt3305.h linux-2.6 }; #if defined(CONFIG_DVB_LGDT3305) || (defined(CONFIG_DVB_LGDT3305_MODULE) && \ -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgs8gxx.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/lgs8gxx.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgs8gxx.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/lgs8gxx.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgs8gxx.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/lgs8gxx.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgs8gxx.c @@ -24,6 +24,7 @@ */ @@ -11021,9 +11113,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/lgs8gxx.c linux-2.6. { struct lgs8gxx_state *priv = fe->demodulator_priv; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/Makefile linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/Makefile ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/Makefile 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/Makefile ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/Makefile @@ -5,7 +5,6 @@ EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -Idrivers/media/common/tuners/ @@ -11054,9 +11147,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/Makefile linux-2.6.3 obj-$(CONFIG_DVB_MB86A16) += mb86a16.o +obj-$(CONFIG_DVB_MB86A20S) += mb86a20s.o +obj-$(CONFIG_DVB_IX2505V) += ix2505v.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a16.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/mb86a16.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a16.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/mb86a16.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a16.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/mb86a16.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a16.c @@ -1833,7 +1833,6 @@ static struct dvb_frontend_ops mb86a16_o .get_frontend_algo = mb86a16_frontend_algo, @@ -11065,9 +11159,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a16.c linux-2.6. .init = mb86a16_init, .sleep = mb86a16_sleep, .read_status = mb86a16_read_status, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a20s.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/mb86a20s.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a20s.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/mb86a20s.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a20s.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a20s.c @@ -0,0 +1,615 @@ +/* + * Fujitu mb86a20s ISDB-T/ISDB-Tsb Module driver @@ -11684,9 +11779,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a20s.c linux-2.6 +MODULE_DESCRIPTION("DVB Frontend module for Fujitsu mb86A20s hardware"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); +MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a20s.h linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/mb86a20s.h ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a20s.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/mb86a20s.h 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a20s.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a20s.h @@ -0,0 +1,52 @@ +/* + * Fujitsu mb86a20s driver @@ -11740,9 +11836,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/mb86a20s.h linux-2.6 +#endif + +#endif /* MB86A20S */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/mt352.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/mt352.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/mt352.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/mt352.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/mt352.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/mt352.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/mt352.c @@ -69,7 +69,7 @@ static int mt352_single_write(struct dvb return 0; } @@ -11752,9 +11849,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/mt352.c linux-2.6.35 { int err,i; for (i=0; i < ilen-1; i++) -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/mt352.h linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/mt352.h ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/mt352.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/mt352.h 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/mt352.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/mt352.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/mt352.h @@ -63,7 +63,7 @@ static inline struct dvb_frontend* mt352 } #endif // CONFIG_DVB_MT352 @@ -11764,9 +11862,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/mt352.h linux-2.6.35 int r = 0; if (fe->ops.write) r = fe->ops.write(fe, buf, len); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1420.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/s5h1420.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1420.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/s5h1420.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1420.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/s5h1420.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1420.c @@ -920,7 +920,6 @@ struct dvb_frontend *s5h1420_attach(cons /* create tuner i2c adapter */ strlcpy(state->tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus", @@ -11775,9 +11874,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1420.c linux-2.6. state->tuner_i2c_adapter.algo = &s5h1420_tuner_i2c_algo; state->tuner_i2c_adapter.algo_data = NULL; i2c_set_adapdata(&state->tuner_i2c_adapter, state); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1432.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/s5h1432.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1432.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/s5h1432.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1432.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1432.c @@ -0,0 +1,415 @@ +/* + * Samsung s5h1432 DVB-T demodulator driver @@ -12194,9 +12294,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1432.c linux-2.6. +MODULE_DESCRIPTION("Samsung s5h1432 DVB-T Demodulator driver"); +MODULE_AUTHOR("Bill Liu"); +MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1432.h linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/s5h1432.h ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1432.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/s5h1432.h 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1432.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1432.h @@ -0,0 +1,91 @@ +/* + * Samsung s5h1432 VSB/QAM demodulator driver @@ -12289,9 +12390,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/s5h1432.h linux-2.6. +#endif /* CONFIG_DVB_s5h1432 */ + +#endif /* __s5h1432_H__ */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/s921.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/s921.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/s921.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/s921.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/s921.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/s921.c @@ -0,0 +1,548 @@ +/* + * Sharp VA3A5JZ921 One Seg Broadcast Module driver @@ -12841,9 +12943,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/s921.c linux-2.6.35. +MODULE_AUTHOR("Mauro Carvalho Chehab "); +MODULE_AUTHOR("Douglas Landgraf "); +MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/s921.h linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/s921.h ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/s921.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/s921.h 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/s921.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/s921.h @@ -0,0 +1,47 @@ +/* + * Sharp s921 driver @@ -12892,9 +12995,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/s921.h linux-2.6.35. +#endif + +#endif /* S921_H */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/si21xx.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/si21xx.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/si21xx.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/si21xx.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/si21xx.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/si21xx.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/si21xx.c @@ -268,7 +268,7 @@ static int si21_writereg(struct si21xx_s return (ret != 1) ? -EREMOTEIO : 0; } @@ -12904,9 +13008,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/si21xx.c linux-2.6.3 { struct si21xx_state *state = fe->demodulator_priv; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb0899_drv.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/stb0899_drv.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb0899_drv.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/stb0899_drv.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb0899_drv.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/stb0899_drv.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb0899_drv.c @@ -714,7 +714,7 @@ static int stb0899_send_diseqc_msg(struc reg = stb0899_read_reg(state, STB0899_DISCNTRL1); STB0899_SETFIELD_VAL(DISPRECHARGE, reg, 0); @@ -12916,9 +13021,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb0899_drv.c linux- return 0; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb6100.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/stb6100.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb6100.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/stb6100.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb6100.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/stb6100.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb6100.c @@ -51,7 +51,7 @@ module_param(verbose, int, 0644); if (x > y) \ printk(format, ##arg); \ @@ -13257,9 +13363,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb6100.c linux-2.6. struct i2c_adapter *i2c) { struct stb6100_state *state = NULL; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb6100.h linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/stb6100.h ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb6100.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/stb6100.h 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb6100.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/stb6100.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb6100.h @@ -97,13 +97,13 @@ struct stb6100_state { #if defined(CONFIG_DVB_STB6100) || (defined(CONFIG_DVB_STB6100_MODULE) && defined(MODULE)) @@ -13276,9 +13383,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/stb6100.h linux-2.6. struct i2c_adapter *i2c) { printk(KERN_WARNING "%s: Driver disabled by Kconfig\n", __func__); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0288.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/stv0288.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0288.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/stv0288.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0288.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/stv0288.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0288.c @@ -6,6 +6,8 @@ Copyright (C) 2008 Igor M. Liplianin Removed stb6000 specific tuner code and revised some @@ -13364,9 +13472,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0288.c linux-2.6. break; tda[2] += 40; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0299.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/stv0299.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0299.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/stv0299.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0299.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/stv0299.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0299.c @@ -92,7 +92,7 @@ static int stv0299_writeregI (struct stv return (ret != 1) ? -EREMOTEIO : 0; } @@ -13376,9 +13485,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0299.c linux-2.6. { struct stv0299_state* state = fe->demodulator_priv; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0299.h linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/stv0299.h ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0299.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/stv0299.h 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0299.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/stv0299.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0299.h @@ -65,7 +65,7 @@ struct stv0299_config * First of each pair is the register, second is the value. * List should be terminated with an 0xff, 0xff pair. @@ -13388,9 +13498,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/stv0299.h linux-2.6. /* master clock to use */ u32 mclk; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/tda10048.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/tda10048.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/tda10048.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/tda10048.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/tda10048.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/tda10048.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/tda10048.c @@ -25,6 +25,7 @@ #include #include @@ -13507,9 +13618,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/tda10048.c linux-2.6 return 0; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/tda1004x.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/tda1004x.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/tda1004x.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/tda1004x.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/tda1004x.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/tda1004x.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/tda1004x.c @@ -598,7 +598,7 @@ static int tda1004x_decode_fec(int tdafe return -1; } @@ -13519,9 +13631,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/tda1004x.c linux-2.6 { struct tda1004x_state* state = fe->demodulator_priv; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/zl10353.c linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/zl10353.c ---- linux-2.6.35.x86_64/drivers/media/dvb/frontends/zl10353.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/frontends/zl10353.c 2010-12-15 11:13:17.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/frontends/zl10353.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/frontends/zl10353.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/frontends/zl10353.c @@ -64,7 +64,7 @@ static int zl10353_single_write(struct d return 0; } @@ -13531,9 +13644,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/frontends/zl10353.c linux-2.6. { int err, i; for (i = 0; i < ilen - 1; i++) -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/hopper_cards.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/hopper_cards.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/hopper_cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/hopper_cards.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/hopper_cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/hopper_cards.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/hopper_cards.c @@ -251,6 +251,8 @@ static struct pci_device_id hopper_pci_t { } }; @@ -13543,9 +13657,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/hopper_cards.c linux-2. static struct pci_driver hopper_pci_driver = { .name = DRIVER_NAME, .id_table = hopper_pci_table, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/hopper_vp3028.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/hopper_vp3028.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/hopper_vp3028.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/hopper_vp3028.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/hopper_vp3028.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/hopper_vp3028.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/hopper_vp3028.c @@ -47,17 +47,17 @@ static int vp3028_frontend_init(struct m struct mantis_hwconfig *config = mantis->hwconfig; int err = 0; @@ -13567,9 +13682,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/hopper_vp3028.c linux-2 if (!fe) return -1; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/Kconfig linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/Kconfig ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/Kconfig 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/Kconfig @@ -1,6 +1,6 @@ config MANTIS_CORE tristate "Mantis/Hopper PCI bridge based devices" @@ -13606,9 +13722,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/Kconfig linux-2.6.35.x8 select DVB_PLL help Support for PCI cards based on the Hopper PCI bridge. -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_cards.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_cards.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_cards.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_cards.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_cards.c @@ -281,6 +281,8 @@ static struct pci_device_id mantis_pci_t { } }; @@ -13618,9 +13735,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_cards.c linux-2. static struct pci_driver mantis_pci_driver = { .name = DRIVER_NAME, .id_table = mantis_pci_table, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_common.h linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_common.h ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_common.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_common.h 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_common.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_common.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_common.h @@ -171,7 +171,9 @@ struct mantis_pci { struct work_struct uart_work; spinlock_t uart_lock; @@ -13632,9 +13750,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_common.h linux-2 }; #define MANTIS_HIF_STATUS (mantis->gpio_status) -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_core.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_core.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_core.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_core.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_core.c @@ -91,10 +91,7 @@ static int get_mac_address(struct mantis return err; } @@ -13647,9 +13766,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_core.c linux-2.6 return 0; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_dvb.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_dvb.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_dvb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_dvb.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_dvb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_dvb.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_dvb.c @@ -47,15 +47,15 @@ int mantis_frontend_power(struct mantis_ switch (power) { case POWER_ON: @@ -13711,9 +13831,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_dvb.c linux-2.6. if (mantis->hwconfig) { result = config->frontend_init(mantis, mantis->fe); if (result < 0) { -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_i2c.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_i2c.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_i2c.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_i2c.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_i2c.c @@ -229,7 +229,6 @@ int __devinit mantis_i2c_init(struct man i2c_set_adapdata(i2c_adapter, mantis); @@ -13722,9 +13843,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_i2c.c linux-2.6. i2c_adapter->algo = &mantis_algo; i2c_adapter->algo_data = NULL; i2c_adapter->timeout = 500; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_input.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_input.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_input.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_input.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_input.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_input.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_input.c @@ -18,8 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -13844,9 +13966,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_input.c linux-2. return 0; } + -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_ioc.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_ioc.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_ioc.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_ioc.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_ioc.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_ioc.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_ioc.c @@ -68,21 +68,14 @@ int mantis_get_mac(struct mantis_pci *ma return err; } @@ -13880,9 +14003,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_ioc.c linux-2.6. int mantis_stream_control(struct mantis_pci *mantis, enum mantis_stream_control stream_ctl) { -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_ioc.h linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_ioc.h ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_ioc.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_ioc.h 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_ioc.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_ioc.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_ioc.h @@ -44,7 +44,7 @@ enum mantis_stream_control { }; @@ -13892,9 +14016,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_ioc.h linux-2.6. extern int mantis_stream_control(struct mantis_pci *mantis, enum mantis_stream_control stream_ctl); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1033.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_vp1033.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1033.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_vp1033.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1033.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_vp1033.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1033.c @@ -173,7 +173,7 @@ static int vp1033_frontend_init(struct m msleep(250); @@ -13904,9 +14029,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1033.c linux-2 if (fe) { fe->ops.tuner_ops.set_params = lgtdqcs001f_tuner_set; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1034.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_vp1034.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1034.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_vp1034.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1034.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_vp1034.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1034.c @@ -50,13 +50,13 @@ int vp1034_set_voltage(struct dvb_fronte switch (voltage) { case SEC_VOLTAGE_13: @@ -13934,9 +14060,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1034.c linux-2 if (fe) { dprintk(MANTIS_ERROR, 1, "found MB86A16 DVB-S/DSS frontend @0x%02x", -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1041.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_vp1041.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1041.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_vp1041.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1041.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_vp1041.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1041.c @@ -316,14 +316,14 @@ static int vp1041_frontend_init(struct m if (err == 0) { mantis_frontend_soft_reset(mantis); @@ -13955,9 +14082,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp1041.c linux-2 dprintk(MANTIS_ERROR, 1, "No LNBP21 found!"); } } else { -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp2033.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_vp2033.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp2033.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_vp2033.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp2033.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_vp2033.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp2033.c @@ -132,7 +132,7 @@ static int vp2033_frontend_init(struct m msleep(250); @@ -13976,9 +14104,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp2033.c linux-2 adapter, read_pwm(mantis)); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp2040.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_vp2040.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp2040.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_vp2040.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp2040.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_vp2040.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp2040.c @@ -132,7 +132,7 @@ static int vp2040_frontend_init(struct m msleep(250); @@ -13997,9 +14126,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp2040.c linux-2 adapter, read_pwm(mantis)); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp3030.c linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_vp3030.c ---- linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp3030.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/mantis/mantis_vp3030.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp3030.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/mantis/mantis_vp3030.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp3030.c @@ -59,21 +59,21 @@ static int vp3030_frontend_init(struct m struct mantis_hwconfig *config = mantis->hwconfig; int err = 0; @@ -14026,9 +14156,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/mantis/mantis_vp3030.c linux-2 } else { dprintk(MANTIS_ERROR, 1, "Frontend on <%s> POWER ON failed! <%d>", adapter->name, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ngene/ngene-core.c linux-2.6.35.x86_64.new/drivers/media/dvb/ngene/ngene-core.c ---- linux-2.6.35.x86_64/drivers/media/dvb/ngene/ngene-core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ngene/ngene-core.c 2010-12-15 11:52:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ngene/ngene-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ngene/ngene-core.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/ngene/ngene-core.c @@ -1516,7 +1516,7 @@ static int init_channels(struct ngene *d void __devexit ngene_remove(struct pci_dev *pdev) @@ -14038,9 +14169,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ngene/ngene-core.c linux-2.6.3 int i; tasklet_kill(&dev->event_tasklet); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ngene/ngene-i2c.c linux-2.6.35.x86_64.new/drivers/media/dvb/ngene/ngene-i2c.c ---- linux-2.6.35.x86_64/drivers/media/dvb/ngene/ngene-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ngene/ngene-i2c.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ngene/ngene-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ngene/ngene-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/ngene/ngene-i2c.c @@ -165,7 +165,6 @@ int ngene_i2c_init(struct ngene *dev, in struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter); @@ -14049,9 +14181,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ngene/ngene-i2c.c linux-2.6.35 strcpy(adap->name, "nGene"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/pluto2/pluto2.c linux-2.6.35.x86_64.new/drivers/media/dvb/pluto2/pluto2.c ---- linux-2.6.35.x86_64/drivers/media/dvb/pluto2/pluto2.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/pluto2/pluto2.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/pluto2/pluto2.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/pluto2/pluto2.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/pluto2/pluto2.c @@ -647,7 +647,6 @@ static int __devinit pluto2_probe(struct i2c_set_adapdata(&pluto->i2c_adap, pluto); strcpy(pluto->i2c_adap.name, DRIVER_NAME); @@ -14060,9 +14193,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/pluto2/pluto2.c linux-2.6.35.x pluto->i2c_adap.dev.parent = &pdev->dev; pluto->i2c_adap.algo_data = &pluto->i2c_bit; pluto->i2c_bit.data = pluto; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/pt1/pt1.c linux-2.6.35.x86_64.new/drivers/media/dvb/pt1/pt1.c ---- linux-2.6.35.x86_64/drivers/media/dvb/pt1/pt1.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/pt1/pt1.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/pt1/pt1.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/pt1/pt1.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/pt1/pt1.c @@ -1087,7 +1087,6 @@ pt1_probe(struct pci_dev *pdev, const st pt1_update_power(pt1); @@ -14071,9 +14205,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/pt1/pt1.c linux-2.6.35.x86_64. i2c_adap->algo = &pt1_i2c_algo; i2c_adap->algo_data = NULL; i2c_adap->dev.parent = &pdev->dev; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/Kconfig linux-2.6.35.x86_64.new/drivers/media/dvb/siano/Kconfig ---- linux-2.6.35.x86_64/drivers/media/dvb/siano/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/siano/Kconfig 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/siano/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/siano/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/dvb/siano/Kconfig @@ -4,7 +4,7 @@ config SMS_SIANO_MDTV @@ -14083,9 +14218,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/Kconfig linux-2.6.35.x86 ---help--- Choose Y or M here if you have MDTV receiver with a Siano chipset. -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/sms-cards.c linux-2.6.35.x86_64.new/drivers/media/dvb/siano/sms-cards.c ---- linux-2.6.35.x86_64/drivers/media/dvb/siano/sms-cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/siano/sms-cards.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/siano/sms-cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/siano/sms-cards.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/siano/sms-cards.c @@ -64,9 +64,11 @@ static struct sms_board sms_boards[] = { .type = SMS_NOVA_B0, .fw[DEVICE_MODE_ISDBT_BDA] = "sms1xxx-hcw-55xxx-isdbt-02.fw", @@ -14098,9 +14234,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/sms-cards.c linux-2.6.35 .led_power = 26, .led_lo = 27, .led_hi = 28, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/sms-cards.h linux-2.6.35.x86_64.new/drivers/media/dvb/siano/sms-cards.h ---- linux-2.6.35.x86_64/drivers/media/dvb/siano/sms-cards.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/siano/sms-cards.h 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/siano/sms-cards.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/siano/sms-cards.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/siano/sms-cards.h @@ -75,7 +75,7 @@ struct sms_board { enum sms_device_type_st type; char *name, *fw[DEVICE_MODE_MAX]; @@ -14110,9 +14247,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/sms-cards.h linux-2.6.35 /* gpios */ int led_power, led_hi, led_lo, lna_ctrl, rf_switch; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/smscoreapi.c linux-2.6.35.x86_64.new/drivers/media/dvb/siano/smscoreapi.c ---- linux-2.6.35.x86_64/drivers/media/dvb/siano/smscoreapi.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/siano/smscoreapi.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/siano/smscoreapi.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/siano/smscoreapi.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/siano/smscoreapi.c @@ -116,9 +116,7 @@ static struct smscore_registry_entry_t * return entry; } @@ -14197,9 +14335,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/smscoreapi.c linux-2.6.3 return -EINVAL; totalLen = sizeof(struct SmsMsgHdr_ST) + -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/smsir.c linux-2.6.35.x86_64.new/drivers/media/dvb/siano/smsir.c ---- linux-2.6.35.x86_64/drivers/media/dvb/siano/smsir.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/siano/smsir.c 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/siano/smsir.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/siano/smsir.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/siano/smsir.c @@ -4,6 +4,11 @@ MDTV receiver kernel modules. Copyright (C) 2006-2009, Uri Shkolnik @@ -14535,9 +14674,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/smsir.c linux-2.6.35.x86 sms_log(""); } - -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/smsir.h linux-2.6.35.x86_64.new/drivers/media/dvb/siano/smsir.h ---- linux-2.6.35.x86_64/drivers/media/dvb/siano/smsir.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/siano/smsir.h 2010-12-15 11:13:15.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/siano/smsir.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/siano/smsir.h ++++ linux-2.6.35.x86_64/drivers/media/dvb/siano/smsir.h @@ -4,6 +4,11 @@ Siano Mobile Silicon, Inc. MDTV receiver kernel modules. Copyright (C) 2006-2009, Uri Shkolnik @@ -14622,9 +14762,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/smsir.h linux-2.6.35.x86 u32 timeout; u32 controller; }; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/smsusb.c linux-2.6.35.x86_64.new/drivers/media/dvb/siano/smsusb.c ---- linux-2.6.35.x86_64/drivers/media/dvb/siano/smsusb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/siano/smsusb.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/siano/smsusb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/siano/smsusb.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/siano/smsusb.c @@ -288,8 +288,7 @@ static int smsusb1_setmode(void *context static void smsusb_term_device(struct usb_interface *intf) @@ -14665,9 +14806,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/siano/smsusb.c linux-2.6.35.x8 struct usb_device *udev = interface_to_usbdev(intf); printk(KERN_INFO "%s: Entering.\n", __func__); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_av.c linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/av7110_av.c ---- linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_av.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/av7110_av.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_av.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ttpci/av7110_av.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_av.c @@ -25,7 +25,7 @@ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html * @@ -14690,9 +14832,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_av.c linux-2.6.35 sync = DVB_RINGBUFFER_PEEK(buf, 0) << 24; sync |= DVB_RINGBUFFER_PEEK(buf, 1) << 16; sync |= DVB_RINGBUFFER_PEEK(buf, 2) << 8; -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110.c linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/av7110.c ---- linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/av7110.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ttpci/av7110.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110.c @@ -26,7 +26,7 @@ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html * @@ -14733,9 +14876,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110.c linux-2.6.35.x8 .flags = SAA7146_USE_I2C_IRQ, .module = THIS_MODULE, -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_ca.c linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/av7110_ca.c ---- linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_ca.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/av7110_ca.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_ca.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ttpci/av7110_ca.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_ca.c @@ -25,7 +25,7 @@ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html * @@ -14745,9 +14889,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_ca.c linux-2.6.35 */ #include -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_hw.c linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/av7110_hw.c ---- linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_hw.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/av7110_hw.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_hw.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ttpci/av7110_hw.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_hw.c @@ -22,7 +22,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Or, point your browser to http://www.gnu.org/copyleft/gpl.html @@ -14757,9 +14902,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_hw.c linux-2.6.35 */ /* for debugging ARM communication: */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_v4l.c linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/av7110_v4l.c ---- linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_v4l.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/av7110_v4l.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_v4l.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ttpci/av7110_v4l.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_v4l.c @@ -22,7 +22,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Or, point your browser to http://www.gnu.org/copyleft/gpl.html @@ -14769,9 +14915,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/av7110_v4l.c linux-2.6.3 */ #include -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-av.c linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/budget-av.c ---- linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-av.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/budget-av.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-av.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ttpci/budget-av.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-av.c @@ -30,7 +30,7 @@ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html * @@ -14781,9 +14928,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-av.c linux-2.6.35 */ #include "budget.h" -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget.c linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/budget.c ---- linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/budget.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ttpci/budget.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget.c @@ -31,7 +31,7 @@ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html * @@ -14793,9 +14941,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget.c linux-2.6.35.x8 */ #include "budget.h" -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-ci.c linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/budget-ci.c ---- linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-ci.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/budget-ci.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-ci.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ttpci/budget-ci.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-ci.c @@ -26,16 +26,15 @@ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html * @@ -14940,9 +15089,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-ci.c linux-2.6.35 } static int ciintf_read_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int address) -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-core.c linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/budget-core.c ---- linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/budget-core.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ttpci/budget-core.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-core.c @@ -31,7 +31,7 @@ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html * @@ -14961,9 +15111,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-core.c linux-2.6. strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name)); saa7146_i2c_adapter_prepare(dev, &budget->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-patch.c linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/budget-patch.c ---- linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-patch.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/budget-patch.c 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-patch.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ttpci/budget-patch.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-patch.c @@ -27,7 +27,7 @@ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html * @@ -14973,9 +15124,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/budget-patch.c linux-2.6 */ #include "av7110.h" -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/Kconfig linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/Kconfig ---- linux-2.6.35.x86_64/drivers/media/dvb/ttpci/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ttpci/Kconfig 2010-12-15 11:13:16.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ttpci/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ttpci/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/dvb/ttpci/Kconfig @@ -89,7 +89,6 @@ config DVB_BUDGET config DVB_BUDGET_CI tristate "Budget cards with onboard CI connector" @@ -14993,9 +15145,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttpci/Kconfig linux-2.6.35.x86 help Support for simple SAA7146 based DVB cards (so called Budget- or Nova-PCI cards) without onboard -diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c linux-2.6.35.x86_64.new/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c ---- linux-2.6.35.x86_64/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c ++++ linux-2.6.35.x86_64/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c @@ -1694,7 +1694,6 @@ static int ttusb_probe(struct usb_interf i2c_set_adapdata(&ttusb->i2c_adap, ttusb); @@ -15004,9 +15157,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget. ttusb->i2c_adap.algo = &ttusb_dec_algo; ttusb->i2c_adap.algo_data = NULL; ttusb->i2c_adap.dev.parent = &udev->dev; -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/imon.c linux-2.6.35.x86_64.new/drivers/media/IR/imon.c ---- linux-2.6.35.x86_64/drivers/media/IR/imon.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/imon.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/imon.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/imon.c ++++ /dev/null @@ -1,2403 +0,0 @@ -/* - * imon.c: input and display driver for SoundGraph iMON IR/VFD/LCD @@ -17411,9 +17565,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/imon.c linux-2.6.35.x86_64.new/ - -module_init(imon_init); -module_exit(imon_exit); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-core-priv.h linux-2.6.35.x86_64.new/drivers/media/IR/ir-core-priv.h ---- linux-2.6.35.x86_64/drivers/media/IR/ir-core-priv.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/ir-core-priv.h 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/ir-core-priv.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/ir-core-priv.h ++++ /dev/null @@ -1,126 +0,0 @@ -/* - * Remote Controller core raw events header @@ -17541,9 +17696,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-core-priv.h linux-2.6.35.x86 -#endif - -#endif /* _IR_RAW_EVENT */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-functions.c linux-2.6.35.x86_64.new/drivers/media/IR/ir-functions.c ---- linux-2.6.35.x86_64/drivers/media/IR/ir-functions.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/ir-functions.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/ir-functions.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/ir-functions.c ++++ /dev/null @@ -1,356 +0,0 @@ -/* - * @@ -17901,9 +18057,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-functions.c linux-2.6.35.x86 - ir_input_nokey(ir->dev, &ir->ir); -} -EXPORT_SYMBOL_GPL(ir_rc5_timer_keyup); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-jvc-decoder.c linux-2.6.35.x86_64.new/drivers/media/IR/ir-jvc-decoder.c ---- linux-2.6.35.x86_64/drivers/media/IR/ir-jvc-decoder.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/ir-jvc-decoder.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/ir-jvc-decoder.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/ir-jvc-decoder.c ++++ /dev/null @@ -1,320 +0,0 @@ -/* ir-jvc-decoder.c - handle JVC IR Pulse/Space protocol - * @@ -18225,9 +18382,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-jvc-decoder.c linux-2.6.35.x -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("David Härdeman "); -MODULE_DESCRIPTION("JVC IR protocol decoder"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-keytable.c linux-2.6.35.x86_64.new/drivers/media/IR/ir-keytable.c ---- linux-2.6.35.x86_64/drivers/media/IR/ir-keytable.c 2010-12-15 10:51:22.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/ir-keytable.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/ir-keytable.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/ir-keytable.c ++++ /dev/null @@ -1,555 +0,0 @@ -/* ir-keytable.c - handle IR scancode->keycode tables - * @@ -18784,9 +18942,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-keytable.c linux-2.6.35.x86_ - -MODULE_AUTHOR("Mauro Carvalho Chehab "); -MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-nec-decoder.c linux-2.6.35.x86_64.new/drivers/media/IR/ir-nec-decoder.c ---- linux-2.6.35.x86_64/drivers/media/IR/ir-nec-decoder.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/ir-nec-decoder.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/ir-nec-decoder.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/ir-nec-decoder.c ++++ /dev/null @@ -1,328 +0,0 @@ -/* ir-nec-decoder.c - handle NEC IR Pulse/Space protocol - * @@ -19116,9 +19275,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-nec-decoder.c linux-2.6.35.x -MODULE_AUTHOR("Mauro Carvalho Chehab "); -MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)"); -MODULE_DESCRIPTION("NEC IR protocol decoder"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-raw-event.c linux-2.6.35.x86_64.new/drivers/media/IR/ir-raw-event.c ---- linux-2.6.35.x86_64/drivers/media/IR/ir-raw-event.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/ir-raw-event.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/ir-raw-event.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/ir-raw-event.c ++++ /dev/null @@ -1,251 +0,0 @@ -/* ir-raw-event.c - handle IR Pulse/Space event - * @@ -19371,9 +19531,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-raw-event.c linux-2.6.35.x86 - schedule_work(&wq_load); -#endif -} -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-rc5-decoder.c linux-2.6.35.x86_64.new/drivers/media/IR/ir-rc5-decoder.c ---- linux-2.6.35.x86_64/drivers/media/IR/ir-rc5-decoder.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/ir-rc5-decoder.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/ir-rc5-decoder.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/ir-rc5-decoder.c ++++ /dev/null @@ -1,324 +0,0 @@ -/* ir-rc5-decoder.c - handle RC5(x) IR Pulse/Space protocol - * @@ -19699,9 +19860,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-rc5-decoder.c linux-2.6.35.x -MODULE_AUTHOR("Mauro Carvalho Chehab "); -MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)"); -MODULE_DESCRIPTION("RC5(x) IR protocol decoder"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-rc6-decoder.c linux-2.6.35.x86_64.new/drivers/media/IR/ir-rc6-decoder.c ---- linux-2.6.35.x86_64/drivers/media/IR/ir-rc6-decoder.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/ir-rc6-decoder.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/ir-rc6-decoder.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/ir-rc6-decoder.c ++++ /dev/null @@ -1,419 +0,0 @@ -/* ir-rc6-decoder.c - A decoder for the RC6 IR protocol - * @@ -20122,9 +20284,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-rc6-decoder.c linux-2.6.35.x -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("David Härdeman "); -MODULE_DESCRIPTION("RC6 IR protocol decoder"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-sony-decoder.c linux-2.6.35.x86_64.new/drivers/media/IR/ir-sony-decoder.c ---- linux-2.6.35.x86_64/drivers/media/IR/ir-sony-decoder.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/ir-sony-decoder.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/ir-sony-decoder.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/ir-sony-decoder.c ++++ /dev/null @@ -1,312 +0,0 @@ -/* ir-sony-decoder.c - handle Sony IR Pulse/Space protocol - * @@ -20438,9 +20601,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-sony-decoder.c linux-2.6.35. -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("David Härdeman "); -MODULE_DESCRIPTION("Sony IR protocol decoder"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-sysfs.c linux-2.6.35.x86_64.new/drivers/media/IR/ir-sysfs.c ---- linux-2.6.35.x86_64/drivers/media/IR/ir-sysfs.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/ir-sysfs.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/ir-sysfs.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/ir-sysfs.c ++++ /dev/null @@ -1,303 +0,0 @@ -/* ir-sysfs.c - sysfs interface for RC devices (/sys/class/rc) - * @@ -20745,9 +20909,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/ir-sysfs.c linux-2.6.35.x86_64. - -module_init(ir_core_init); -module_exit(ir_core_exit); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/Kconfig linux-2.6.35.x86_64.new/drivers/media/IR/Kconfig ---- linux-2.6.35.x86_64/drivers/media/IR/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/Kconfig 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/Kconfig ++++ /dev/null @@ -1,70 +0,0 @@ -config IR_CORE - tristate @@ -20819,9 +20984,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/Kconfig linux-2.6.35.x86_64.new - - To compile this driver as a module, choose M here: the - module will be called imon. -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/Kconfig linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/Kconfig ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/Kconfig 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/Kconfig ++++ /dev/null @@ -1,15 +0,0 @@ -config RC_MAP - tristate "Compile Remote Controller keymap modules" @@ -20838,9 +21004,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/Kconfig linux-2.6.35.x8 - provide the tool and the same RC maps for load from - userspace. Its available at - http://git.linuxtv.org/v4l-utils -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/Makefile linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/Makefile ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/Makefile 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/Makefile ++++ /dev/null @@ -1,68 +0,0 @@ -obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \ - rc-apac-viewcomp.o \ @@ -20910,9 +21077,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/Makefile linux-2.6.35.x - rc-videomate-tv-pvr.o \ - rc-winfast.o \ - rc-winfast-usbii-deluxe.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c ++++ /dev/null @@ -1,89 +0,0 @@ -/* adstech-dvb-t-pci.h - Keytable for adstech_dvb_t_pci Remote Controller - * @@ -21003,9 +21171,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-apac-viewcomp.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-apac-viewcomp.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-apac-viewcomp.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-apac-viewcomp.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-apac-viewcomp.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-apac-viewcomp.c ++++ /dev/null @@ -1,80 +0,0 @@ -/* apac-viewcomp.h - Keytable for apac_viewcomp Remote Controller - * @@ -21087,9 +21256,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-apac-viewcomp.c linu - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-asus-pc39.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-asus-pc39.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-asus-pc39.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-asus-pc39.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-asus-pc39.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-asus-pc39.c ++++ /dev/null @@ -1,91 +0,0 @@ -/* asus-pc39.h - Keytable for asus_pc39 Remote Controller - * @@ -21182,9 +21352,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-asus-pc39.c linux-2. - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c ++++ /dev/null @@ -1,69 +0,0 @@ -/* ati-tv-wonder-hd-600.h - Keytable for ati_tv_wonder_hd_600 Remote Controller - * @@ -21255,9 +21426,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-a16d.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avermedia-a16d.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-a16d.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avermedia-a16d.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-a16d.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-avermedia-a16d.c ++++ /dev/null @@ -1,75 +0,0 @@ -/* avermedia-a16d.h - Keytable for avermedia_a16d Remote Controller - * @@ -21334,9 +21506,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-a16d.c lin - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avermedia.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avermedia.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-avermedia.c ++++ /dev/null @@ -1,86 +0,0 @@ -/* avermedia.h - Keytable for avermedia Remote Controller - * @@ -21424,9 +21597,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia.c linux-2. - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-cardbus.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avermedia-cardbus.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-cardbus.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avermedia-cardbus.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-cardbus.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-avermedia-cardbus.c ++++ /dev/null @@ -1,97 +0,0 @@ -/* avermedia-cardbus.h - Keytable for avermedia_cardbus Remote Controller - * @@ -21525,9 +21699,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-cardbus.c - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-dvbt.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avermedia-dvbt.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-dvbt.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avermedia-dvbt.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-dvbt.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-avermedia-dvbt.c ++++ /dev/null @@ -1,78 +0,0 @@ -/* avermedia-dvbt.h - Keytable for avermedia_dvbt Remote Controller - * @@ -21607,9 +21782,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-dvbt.c lin - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-m135a.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avermedia-m135a.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-m135a.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avermedia-m135a.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-m135a.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-avermedia-m135a.c ++++ /dev/null @@ -1,147 +0,0 @@ -/* avermedia-m135a.c - Keytable for Avermedia M135A Remote Controllers - * @@ -21758,9 +21934,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-m135a.c li - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c ++++ /dev/null @@ -1,95 +0,0 @@ -/* avermedia-m733a-rm-k6.h - Keytable for avermedia_m733a_rm_k6 Remote Controller - * @@ -21857,9 +22034,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avertv-303.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avertv-303.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avertv-303.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-avertv-303.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avertv-303.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-avertv-303.c ++++ /dev/null @@ -1,85 +0,0 @@ -/* avertv-303.h - Keytable for avertv_303 Remote Controller - * @@ -21946,9 +22124,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-avertv-303.c linux-2 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-behold.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-behold.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-behold.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-behold.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-behold.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-behold.c ++++ /dev/null @@ -1,141 +0,0 @@ -/* behold.h - Keytable for behold Remote Controller - * @@ -22091,9 +22270,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-behold.c linux-2.6.3 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-behold-columbus.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-behold-columbus.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-behold-columbus.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-behold-columbus.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-behold-columbus.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-behold-columbus.c ++++ /dev/null @@ -1,108 +0,0 @@ -/* behold-columbus.h - Keytable for behold_columbus Remote Controller - * @@ -22203,9 +22383,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-behold-columbus.c li - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-budget-ci-old.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-budget-ci-old.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-budget-ci-old.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-budget-ci-old.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-budget-ci-old.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-budget-ci-old.c ++++ /dev/null @@ -1,92 +0,0 @@ -/* budget-ci-old.h - Keytable for budget_ci_old Remote Controller - * @@ -22299,9 +22480,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-budget-ci-old.c linu - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-cinergy-1400.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-cinergy-1400.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-cinergy-1400.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-cinergy-1400.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-cinergy-1400.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-cinergy-1400.c ++++ /dev/null @@ -1,84 +0,0 @@ -/* cinergy-1400.h - Keytable for cinergy_1400 Remote Controller - * @@ -22387,9 +22569,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-cinergy-1400.c linux - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-cinergy.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-cinergy.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-cinergy.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-cinergy.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-cinergy.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-cinergy.c ++++ /dev/null @@ -1,78 +0,0 @@ -/* cinergy.h - Keytable for cinergy Remote Controller - * @@ -22469,9 +22652,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-cinergy.c linux-2.6. - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-dm1105-nec.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-dm1105-nec.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-dm1105-nec.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-dm1105-nec.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-dm1105-nec.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-dm1105-nec.c ++++ /dev/null @@ -1,76 +0,0 @@ -/* dm1105-nec.h - Keytable for dm1105_nec Remote Controller - * @@ -22549,9 +22733,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-dm1105-nec.c linux-2 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c ++++ /dev/null @@ -1,78 +0,0 @@ -/* dntv-live-dvb-t.h - Keytable for dntv_live_dvb_t Remote Controller - * @@ -22631,9 +22816,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c li - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c ++++ /dev/null @@ -1,97 +0,0 @@ -/* dntv-live-dvbt-pro.h - Keytable for dntv_live_dvbt_pro Remote Controller - * @@ -22732,9 +22918,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-empty.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-empty.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-empty.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-empty.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-empty.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-empty.c ++++ /dev/null @@ -1,44 +0,0 @@ -/* empty.h - Keytable for empty Remote Controller - * @@ -22780,9 +22967,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-empty.c linux-2.6.35 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-em-terratec.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-em-terratec.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-em-terratec.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-em-terratec.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-em-terratec.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-em-terratec.c ++++ /dev/null @@ -1,69 +0,0 @@ -/* em-terratec.h - Keytable for em_terratec Remote Controller - * @@ -22853,9 +23041,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-em-terratec.c linux- - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-encore-enltv2.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-encore-enltv2.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-encore-enltv2.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-encore-enltv2.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-encore-enltv2.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-encore-enltv2.c ++++ /dev/null @@ -1,90 +0,0 @@ -/* encore-enltv2.h - Keytable for encore_enltv2 Remote Controller - * @@ -22947,9 +23136,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-encore-enltv2.c linu - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-encore-enltv.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-encore-enltv.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-encore-enltv.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-encore-enltv.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-encore-enltv.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-encore-enltv.c ++++ /dev/null @@ -1,112 +0,0 @@ -/* encore-enltv.h - Keytable for encore_enltv Remote Controller - * @@ -23063,9 +23253,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-encore-enltv.c linux - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-encore-enltv-fm53.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-encore-enltv-fm53.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-encore-enltv-fm53.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-encore-enltv-fm53.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-encore-enltv-fm53.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-encore-enltv-fm53.c ++++ /dev/null @@ -1,81 +0,0 @@ -/* encore-enltv-fm53.h - Keytable for encore_enltv_fm53 Remote Controller - * @@ -23148,9 +23339,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-encore-enltv-fm53.c - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-evga-indtube.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-evga-indtube.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-evga-indtube.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-evga-indtube.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-evga-indtube.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-evga-indtube.c ++++ /dev/null @@ -1,61 +0,0 @@ -/* evga-indtube.h - Keytable for evga_indtube Remote Controller - * @@ -23213,9 +23405,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-evga-indtube.c linux - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-eztv.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-eztv.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-eztv.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-eztv.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-eztv.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-eztv.c ++++ /dev/null @@ -1,96 +0,0 @@ -/* eztv.h - Keytable for eztv Remote Controller - * @@ -23313,9 +23506,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-eztv.c linux-2.6.35. - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-flydvb.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-flydvb.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-flydvb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-flydvb.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-flydvb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-flydvb.c ++++ /dev/null @@ -1,77 +0,0 @@ -/* flydvb.h - Keytable for flydvb Remote Controller - * @@ -23394,9 +23588,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-flydvb.c linux-2.6.3 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-flyvideo.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-flyvideo.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-flyvideo.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-flyvideo.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-flyvideo.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-flyvideo.c ++++ /dev/null @@ -1,70 +0,0 @@ -/* flyvideo.h - Keytable for flyvideo Remote Controller - * @@ -23468,9 +23663,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-flyvideo.c linux-2.6 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-fusionhdtv-mce.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-fusionhdtv-mce.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-fusionhdtv-mce.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-fusionhdtv-mce.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-fusionhdtv-mce.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-fusionhdtv-mce.c ++++ /dev/null @@ -1,98 +0,0 @@ -/* fusionhdtv-mce.h - Keytable for fusionhdtv_mce Remote Controller - * @@ -23570,9 +23766,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-fusionhdtv-mce.c lin - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-gadmei-rm008z.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-gadmei-rm008z.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-gadmei-rm008z.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-gadmei-rm008z.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-gadmei-rm008z.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-gadmei-rm008z.c ++++ /dev/null @@ -1,81 +0,0 @@ -/* gadmei-rm008z.h - Keytable for gadmei_rm008z Remote Controller - * @@ -23655,9 +23852,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-gadmei-rm008z.c linu - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c ++++ /dev/null @@ -1,84 +0,0 @@ -/* genius-tvgo-a11mce.h - Keytable for genius_tvgo_a11mce Remote Controller - * @@ -23743,9 +23941,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-gotview7135.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-gotview7135.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-gotview7135.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-gotview7135.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-gotview7135.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-gotview7135.c ++++ /dev/null @@ -1,79 +0,0 @@ -/* gotview7135.h - Keytable for gotview7135 Remote Controller - * @@ -23826,9 +24025,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-gotview7135.c linux- - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-hauppauge-new.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-hauppauge-new.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-hauppauge-new.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-hauppauge-new.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-hauppauge-new.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-hauppauge-new.c ++++ /dev/null @@ -1,100 +0,0 @@ -/* hauppauge-new.h - Keytable for hauppauge_new Remote Controller - * @@ -23930,9 +24130,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-hauppauge-new.c linu - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-imon-mce.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-imon-mce.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-imon-mce.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-imon-mce.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-imon-mce.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-imon-mce.c ++++ /dev/null @@ -1,142 +0,0 @@ -/* rc5-imon-mce.c - Keytable for Windows Media Center RC-6 remotes for use - * with the SoundGraph iMON/Antec Veris hardware IR decoder @@ -24076,9 +24277,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-imon-mce.c linux-2.6 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jarod Wilson "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-imon-pad.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-imon-pad.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-imon-pad.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-imon-pad.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-imon-pad.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-imon-pad.c ++++ /dev/null @@ -1,156 +0,0 @@ -/* rc5-imon-pad.c - Keytable for SoundGraph iMON PAD and Antec Veris - * RM-200 Remote Control @@ -24236,9 +24438,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-imon-pad.c linux-2.6 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jarod Wilson "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-iodata-bctv7e.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-iodata-bctv7e.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-iodata-bctv7e.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-iodata-bctv7e.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-iodata-bctv7e.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-iodata-bctv7e.c ++++ /dev/null @@ -1,88 +0,0 @@ -/* iodata-bctv7e.h - Keytable for iodata_bctv7e Remote Controller - * @@ -24328,9 +24531,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-iodata-bctv7e.c linu - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-kaiomy.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-kaiomy.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-kaiomy.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-kaiomy.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-kaiomy.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-kaiomy.c ++++ /dev/null @@ -1,87 +0,0 @@ -/* kaiomy.h - Keytable for kaiomy Remote Controller - * @@ -24419,9 +24623,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-kaiomy.c linux-2.6.3 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-kworld-315u.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-kworld-315u.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-kworld-315u.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-kworld-315u.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-kworld-315u.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-kworld-315u.c ++++ /dev/null @@ -1,83 +0,0 @@ -/* kworld-315u.h - Keytable for kworld_315u Remote Controller - * @@ -24506,9 +24711,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-kworld-315u.c linux- - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-kworld-plus-tv-analog.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-kworld-plus-tv-analog.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-kworld-plus-tv-analog.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-kworld-plus-tv-analog.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-kworld-plus-tv-analog.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-kworld-plus-tv-analog.c ++++ /dev/null @@ -1,99 +0,0 @@ -/* kworld-plus-tv-analog.h - Keytable for kworld_plus_tv_analog Remote Controller - * @@ -24609,9 +24815,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-kworld-plus-tv-analo - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-manli.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-manli.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-manli.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-manli.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-manli.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-manli.c ++++ /dev/null @@ -1,135 +0,0 @@ -/* manli.h - Keytable for manli Remote Controller - * @@ -24748,9 +24955,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-manli.c linux-2.6.35 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-msi-tvanywhere.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-msi-tvanywhere.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-msi-tvanywhere.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-msi-tvanywhere.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-msi-tvanywhere.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-msi-tvanywhere.c ++++ /dev/null @@ -1,69 +0,0 @@ -/* msi-tvanywhere.h - Keytable for msi_tvanywhere Remote Controller - * @@ -24821,9 +25029,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-msi-tvanywhere.c lin - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c ++++ /dev/null @@ -1,123 +0,0 @@ -/* msi-tvanywhere-plus.h - Keytable for msi_tvanywhere_plus Remote Controller - * @@ -24948,9 +25157,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-msi-tvanywhere-plus. - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-nebula.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-nebula.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-nebula.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-nebula.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-nebula.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-nebula.c ++++ /dev/null @@ -1,96 +0,0 @@ -/* nebula.h - Keytable for nebula Remote Controller - * @@ -25048,9 +25258,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-nebula.c linux-2.6.3 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c ++++ /dev/null @@ -1,105 +0,0 @@ -/* nec-terratec-cinergy-xs.h - Keytable for nec_terratec_cinergy_xs Remote Controller - * @@ -25157,9 +25368,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-nec-terratec-cinergy - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-norwood.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-norwood.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-norwood.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-norwood.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-norwood.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-norwood.c ++++ /dev/null @@ -1,85 +0,0 @@ -/* norwood.h - Keytable for norwood Remote Controller - * @@ -25246,9 +25458,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-norwood.c linux-2.6. - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-npgtech.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-npgtech.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-npgtech.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-npgtech.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-npgtech.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-npgtech.c ++++ /dev/null @@ -1,80 +0,0 @@ -/* npgtech.h - Keytable for npgtech Remote Controller - * @@ -25330,9 +25543,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-npgtech.c linux-2.6. - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pctv-sedna.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pctv-sedna.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pctv-sedna.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pctv-sedna.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pctv-sedna.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-pctv-sedna.c ++++ /dev/null @@ -1,80 +0,0 @@ -/* pctv-sedna.h - Keytable for pctv_sedna Remote Controller - * @@ -25414,9 +25628,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pctv-sedna.c linux-2 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pinnacle-color.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pinnacle-color.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pinnacle-color.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pinnacle-color.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pinnacle-color.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-pinnacle-color.c ++++ /dev/null @@ -1,94 +0,0 @@ -/* pinnacle-color.h - Keytable for pinnacle_color Remote Controller - * @@ -25512,9 +25727,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pinnacle-color.c lin - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pinnacle-grey.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pinnacle-grey.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pinnacle-grey.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pinnacle-grey.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pinnacle-grey.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-pinnacle-grey.c ++++ /dev/null @@ -1,89 +0,0 @@ -/* pinnacle-grey.h - Keytable for pinnacle_grey Remote Controller - * @@ -25605,9 +25821,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pinnacle-grey.c linu - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c ++++ /dev/null @@ -1,73 +0,0 @@ -/* pinnacle-pctv-hd.h - Keytable for pinnacle_pctv_hd Remote Controller - * @@ -25682,9 +25899,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c l - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pixelview.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pixelview.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pixelview.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pixelview.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pixelview.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-pixelview.c ++++ /dev/null @@ -1,82 +0,0 @@ -/* pixelview.h - Keytable for pixelview Remote Controller - * @@ -25768,9 +25986,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pixelview.c linux-2. - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pixelview-mk12.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pixelview-mk12.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pixelview-mk12.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pixelview-mk12.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pixelview-mk12.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-pixelview-mk12.c ++++ /dev/null @@ -1,83 +0,0 @@ -/* rc-pixelview-mk12.h - Keytable for pixelview Remote Controller - * @@ -25855,9 +26074,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pixelview-mk12.c lin - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pixelview-new.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pixelview-new.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pixelview-new.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pixelview-new.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pixelview-new.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-pixelview-new.c ++++ /dev/null @@ -1,83 +0,0 @@ -/* pixelview-new.h - Keytable for pixelview_new Remote Controller - * @@ -25942,9 +26162,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pixelview-new.c linu - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-powercolor-real-angel.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-powercolor-real-angel.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-powercolor-real-angel.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-powercolor-real-angel.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-powercolor-real-angel.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-powercolor-real-angel.c ++++ /dev/null @@ -1,81 +0,0 @@ -/* powercolor-real-angel.h - Keytable for powercolor_real_angel Remote Controller - * @@ -26027,9 +26248,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-powercolor-real-ange - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-proteus-2309.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-proteus-2309.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-proteus-2309.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-proteus-2309.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-proteus-2309.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-proteus-2309.c ++++ /dev/null @@ -1,69 +0,0 @@ -/* proteus-2309.h - Keytable for proteus_2309 Remote Controller - * @@ -26100,9 +26322,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-proteus-2309.c linux - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-purpletv.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-purpletv.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-purpletv.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-purpletv.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-purpletv.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-purpletv.c ++++ /dev/null @@ -1,81 +0,0 @@ -/* purpletv.h - Keytable for purpletv Remote Controller - * @@ -26185,9 +26408,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-purpletv.c linux-2.6 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pv951.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pv951.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pv951.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-pv951.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pv951.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-pv951.c ++++ /dev/null @@ -1,78 +0,0 @@ -/* pv951.h - Keytable for pv951 Remote Controller - * @@ -26267,9 +26491,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-pv951.c linux-2.6.35 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c ++++ /dev/null @@ -1,103 +0,0 @@ -/* rc5-hauppauge-new.h - Keytable for rc5_hauppauge_new Remote Controller - * @@ -26374,9 +26599,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-rc5-tv.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-rc5-tv.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-rc5-tv.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-rc5-tv.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-rc5-tv.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-rc5-tv.c ++++ /dev/null @@ -1,81 +0,0 @@ -/* rc5-tv.h - Keytable for rc5_tv Remote Controller - * @@ -26459,9 +26685,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-rc5-tv.c linux-2.6.3 - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-real-audio-220-32-keys.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-real-audio-220-32-keys.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-real-audio-220-32-keys.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-real-audio-220-32-keys.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-real-audio-220-32-keys.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-real-audio-220-32-keys.c ++++ /dev/null @@ -1,78 +0,0 @@ -/* real-audio-220-32-keys.h - Keytable for real_audio_220_32_keys Remote Controller - * @@ -26541,9 +26768,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-real-audio-220-32-ke - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-tbs-nec.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-tbs-nec.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-tbs-nec.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-tbs-nec.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-tbs-nec.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-tbs-nec.c ++++ /dev/null @@ -1,73 +0,0 @@ -/* tbs-nec.h - Keytable for tbs_nec Remote Controller - * @@ -26618,9 +26846,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-tbs-nec.c linux-2.6. - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c ++++ /dev/null @@ -1,92 +0,0 @@ -/* terratec-cinergy-xs.h - Keytable for terratec_cinergy_xs Remote Controller - * @@ -26714,9 +26943,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-terratec-cinergy-xs. - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-tevii-nec.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-tevii-nec.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-tevii-nec.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-tevii-nec.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-tevii-nec.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-tevii-nec.c ++++ /dev/null @@ -1,88 +0,0 @@ -/* tevii-nec.h - Keytable for tevii_nec Remote Controller - * @@ -26806,9 +27036,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-tevii-nec.c linux-2. - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-tt-1500.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-tt-1500.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-tt-1500.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-tt-1500.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-tt-1500.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-tt-1500.c ++++ /dev/null @@ -1,82 +0,0 @@ -/* tt-1500.h - Keytable for tt_1500 Remote Controller - * @@ -26892,9 +27123,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-tt-1500.c linux-2.6. - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-videomate-s350.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-videomate-s350.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-videomate-s350.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-videomate-s350.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-videomate-s350.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-videomate-s350.c ++++ /dev/null @@ -1,85 +0,0 @@ -/* videomate-s350.h - Keytable for videomate_s350 Remote Controller - * @@ -26981,9 +27213,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-videomate-s350.c lin - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-videomate-tv-pvr.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-videomate-tv-pvr.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-videomate-tv-pvr.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-videomate-tv-pvr.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-videomate-tv-pvr.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-videomate-tv-pvr.c ++++ /dev/null @@ -1,87 +0,0 @@ -/* videomate-tv-pvr.h - Keytable for videomate_tv_pvr Remote Controller - * @@ -27072,9 +27305,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-videomate-tv-pvr.c l - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-winfast.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-winfast.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-winfast.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-winfast.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-winfast.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-winfast.c ++++ /dev/null @@ -1,102 +0,0 @@ -/* winfast.h - Keytable for winfast Remote Controller - * @@ -27178,9 +27412,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-winfast.c linux-2.6. - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c ---- linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c ++++ /dev/null @@ -1,82 +0,0 @@ -/* winfast-usbii-deluxe.h - Keytable for winfast_usbii_deluxe Remote Controller - * @@ -27264,9 +27499,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/keymaps/rc-winfast-usbii-deluxe - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/Makefile linux-2.6.35.x86_64.new/drivers/media/IR/Makefile ---- linux-2.6.35.x86_64/drivers/media/IR/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/Makefile 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/Makefile ++++ /dev/null @@ -1,15 +0,0 @@ -ir-common-objs := ir-functions.o -ir-core-objs := ir-keytable.o ir-sysfs.o ir-raw-event.o rc-map.o @@ -27283,9 +27519,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/Makefile linux-2.6.35.x86_64.ne - -# stand-alone IR receivers/transmitters -obj-$(CONFIG_IR_IMON) += imon.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/rc-map.c linux-2.6.35.x86_64.new/drivers/media/IR/rc-map.c ---- linux-2.6.35.x86_64/drivers/media/IR/rc-map.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/IR/rc-map.c 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/IR/rc-map.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/IR/rc-map.c ++++ /dev/null @@ -1,84 +0,0 @@ -/* ir-raw-event.c - handle IR Pulse/Space event - * @@ -27371,9 +27608,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/IR/rc-map.c linux-2.6.35.x86_64.ne -} -EXPORT_SYMBOL_GPL(ir_unregister_map); - -diff -Naurp linux-2.6.35.x86_64/drivers/media/Kconfig linux-2.6.35.x86_64.new/drivers/media/Kconfig ---- linux-2.6.35.x86_64/drivers/media/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/Kconfig 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/Kconfig @@ -1,3 +1,6 @@ +config BKL + bool @@ -27390,9 +27628,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/Kconfig linux-2.6.35.x86_64.new/dr # # Tuner drivers for DVB and V4L -diff -Naurp linux-2.6.35.x86_64/drivers/media/Makefile linux-2.6.35.x86_64.new/drivers/media/Makefile ---- linux-2.6.35.x86_64/drivers/media/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/Makefile 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/Makefile ++++ linux-2.6.35.x86_64/drivers/media/Makefile @@ -2,7 +2,7 @@ # Makefile for the kernel multimedia device drivers. # @@ -27402,9 +27641,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/Makefile linux-2.6.35.x86_64.new/d obj-$(CONFIG_VIDEO_DEV) += radio/ obj-$(CONFIG_DVB_CORE) += dvb/ -diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/radio-cadet.c linux-2.6.35.x86_64.new/drivers/media/radio/radio-cadet.c ---- linux-2.6.35.x86_64/drivers/media/radio/radio-cadet.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/radio/radio-cadet.c 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/radio/radio-cadet.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/radio/radio-cadet.c ++++ linux-2.6.35.x86_64/drivers/media/radio/radio-cadet.c @@ -374,7 +374,8 @@ static int vidioc_g_tuner(struct file *f switch (v->index) { case 0: @@ -27415,9 +27655,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/radio-cadet.c linux-2.6.35.x v->rangelow = 1400; /* 87.5 MHz */ v->rangehigh = 1728; /* 108.0 MHz */ v->rxsubchans = cadet_getstereo(dev); -diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/radio-maxiradio.c linux-2.6.35.x86_64.new/drivers/media/radio/radio-maxiradio.c ---- linux-2.6.35.x86_64/drivers/media/radio/radio-maxiradio.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/radio/radio-maxiradio.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/radio/radio-maxiradio.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/radio/radio-maxiradio.c ++++ linux-2.6.35.x86_64/drivers/media/radio/radio-maxiradio.c @@ -13,7 +13,7 @@ * anybody does please mail me. * @@ -27427,9 +27668,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/radio-maxiradio.c linux-2.6. * * * CHANGES: -diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/radio-mr800.c linux-2.6.35.x86_64.new/drivers/media/radio/radio-mr800.c ---- linux-2.6.35.x86_64/drivers/media/radio/radio-mr800.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/radio/radio-mr800.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/radio/radio-mr800.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/radio/radio-mr800.c ++++ linux-2.6.35.x86_64/drivers/media/radio/radio-mr800.c @@ -176,8 +176,6 @@ static int amradio_set_mute(struct amrad int retval; int size; @@ -27614,9 +27856,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/radio-mr800.c linux-2.6.35.x video_set_drvdata(&radio->videodev, radio); retval = video_register_device(&radio->videodev, VFL_TYPE_RADIO, -diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/radio-si4713.c linux-2.6.35.x86_64.new/drivers/media/radio/radio-si4713.c ---- linux-2.6.35.x86_64/drivers/media/radio/radio-si4713.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/radio/radio-si4713.c 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/radio/radio-si4713.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/radio/radio-si4713.c ++++ linux-2.6.35.x86_64/drivers/media/radio/radio-si4713.c @@ -291,19 +291,19 @@ static int radio_si4713_pdriver_probe(st goto unregister_v4l2_dev; } @@ -27662,9 +27905,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/radio-si4713.c linux-2.6.35. v4l2_device_unregister(&rsdev->v4l2_dev); kfree(rsdev); -diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/radio-typhoon.c linux-2.6.35.x86_64.new/drivers/media/radio/radio-typhoon.c ---- linux-2.6.35.x86_64/drivers/media/radio/radio-typhoon.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/radio/radio-typhoon.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/radio/radio-typhoon.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/radio/radio-typhoon.c ++++ linux-2.6.35.x86_64/drivers/media/radio/radio-typhoon.c @@ -1,9 +1,6 @@ /* Typhoon Radio Card driver for radio support * (c) 1999 Dr. Henrik Seidel @@ -27675,9 +27919,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/radio-typhoon.c linux-2.6.35 * Notes on the hardware * * This card has two output sockets, one for speakers and one for line. -diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-common.c linux-2.6.35.x86_64.new/drivers/media/radio/si470x/radio-si470x-common.c ---- linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-common.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/radio/si470x/radio-si470x-common.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-common.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/radio/si470x/radio-si470x-common.c ++++ linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-common.c @@ -408,17 +408,15 @@ done: /* * si470x_rds_on - switch on rds reception @@ -27862,9 +28107,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-common.c return retval; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x.h linux-2.6.35.x86_64.new/drivers/media/radio/si470x/radio-si470x.h ---- linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/radio/si470x/radio-si470x.h 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/radio/si470x/radio-si470x.h ++++ linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x.h @@ -177,7 +177,6 @@ struct si470x_device { /* driver management */ @@ -27881,9 +28127,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x.h linux- int si470x_fops_open(struct file *file); int si470x_fops_release(struct file *file); int si470x_vidioc_querycap(struct file *file, void *priv, -diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-i2c.c linux-2.6.35.x86_64.new/drivers/media/radio/si470x/radio-si470x-i2c.c ---- linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/radio/si470x/radio-si470x-i2c.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/radio/si470x/radio-si470x-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-i2c.c @@ -395,7 +395,7 @@ static int __devinit si470x_i2c_probe(st radio->registers[POWERCFG] = POWERCFG_ENABLE; if (si470x_set_register(radio, POWERCFG) < 0) { @@ -27893,9 +28140,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-i2c.c li } msleep(110); -diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-usb.c linux-2.6.35.x86_64.new/drivers/media/radio/si470x/radio-si470x-usb.c ---- linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-usb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/radio/si470x/radio-si470x-usb.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-usb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/radio/si470x/radio-si470x-usb.c ++++ linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-usb.c @@ -517,7 +517,7 @@ int si470x_fops_open(struct file *file) struct si470x_device *radio = video_drvdata(file); int retval; @@ -27971,9 +28219,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/si470x/radio-si470x-usb.c li } } -diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/si4713-i2c.c linux-2.6.35.x86_64.new/drivers/media/radio/si4713-i2c.c ---- linux-2.6.35.x86_64/drivers/media/radio/si4713-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/radio/si4713-i2c.c 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/radio/si4713-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/radio/si4713-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/radio/si4713-i2c.c @@ -27,6 +27,8 @@ #include #include @@ -28169,9 +28418,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/si4713-i2c.c linux-2.6.35.x8 kfree(sdev); return 0; -diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/si4713-i2c.h linux-2.6.35.x86_64.new/drivers/media/radio/si4713-i2c.h ---- linux-2.6.35.x86_64/drivers/media/radio/si4713-i2c.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/radio/si4713-i2c.h 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/radio/si4713-i2c.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/radio/si4713-i2c.h ++++ linux-2.6.35.x86_64/drivers/media/radio/si4713-i2c.h @@ -211,6 +211,8 @@ struct acomp_info { u32 enabled; }; @@ -28195,9 +28445,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/si4713-i2c.h linux-2.6.35.x8 u32 frequency; u32 preemphasis; u32 mute; -diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/tef6862.c linux-2.6.35.x86_64.new/drivers/media/radio/tef6862.c ---- linux-2.6.35.x86_64/drivers/media/radio/tef6862.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/radio/tef6862.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/radio/tef6862.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/radio/tef6862.c ++++ linux-2.6.35.x86_64/drivers/media/radio/tef6862.c @@ -22,7 +22,6 @@ #include #include @@ -28206,9 +28457,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/radio/tef6862.c linux-2.6.35.x86_6 #include #include #include -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ene_ir.c linux-2.6.35.x86_64.new/drivers/media/rc/ene_ir.c ---- linux-2.6.35.x86_64/drivers/media/rc/ene_ir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/ene_ir.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/ene_ir.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/ene_ir.c @@ -0,0 +1,1208 @@ +/* + * driver for ENE KB3926 B/C/D/E/F CIR (pnp id: ENE0XXX) @@ -28658,27 +28910,27 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ene_ir.c linux-2.6.35.x86_64.ne + +select_timeout: + if (dev->rx_fan_input_inuse) { -+ dev->rdev->rx_resolution = MS_TO_NS(ENE_FW_SAMPLE_PERIOD_FAN); ++ dev->rdev->rx_resolution = MS_TO_US(ENE_FW_SAMPLE_PERIOD_FAN); + + /* Fan input doesn't support timeouts, it just ends the + input with a maximum sample */ + dev->rdev->min_timeout = dev->rdev->max_timeout = -+ MS_TO_NS(ENE_FW_SMPL_BUF_FAN_MSK * ++ MS_TO_US(ENE_FW_SMPL_BUF_FAN_MSK * + ENE_FW_SAMPLE_PERIOD_FAN); + } else { -+ dev->rdev->rx_resolution = MS_TO_NS(sample_period); ++ dev->rdev->rx_resolution = MS_TO_US(sample_period); + + /* Theoreticly timeout is unlimited, but we cap it + * because it was seen that on one device, it + * would stop sending spaces after around 250 msec. + * Besides, this is close to 2^32 anyway and timeout is u32. + */ -+ dev->rdev->min_timeout = MS_TO_NS(127 * sample_period); -+ dev->rdev->max_timeout = MS_TO_NS(200000); ++ dev->rdev->min_timeout = MS_TO_US(127 * sample_period); ++ dev->rdev->max_timeout = MS_TO_US(200000); + } + + if (dev->hw_learning_and_tx_capable) -+ dev->rdev->tx_resolution = MS_TO_NS(sample_period); ++ dev->rdev->tx_resolution = MS_TO_US(sample_period); + + if (dev->rdev->timeout > dev->rdev->max_timeout) + dev->rdev->timeout = dev->rdev->max_timeout; @@ -29013,7 +29265,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ene_ir.c linux-2.6.35.x86_64.ne + + dbg("RX: %d (%s)", hw_sample, pulse ? "pulse" : "space"); + -+ ev.duration = MS_TO_NS(hw_sample); ++ ev.duration = MS_TO_US(hw_sample); + ev.pulse = pulse; + ir_raw_event_store_with_filter(dev->rdev, &ev); + } @@ -29033,7 +29285,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ene_ir.c linux-2.6.35.x86_64.ne + dev->learning_mode_enabled = learning_mode_force; + + /* Set reasonable default timeout */ -+ dev->rdev->timeout = MS_TO_NS(150000); ++ dev->rdev->timeout = MS_TO_US(150000); +} + +/* Upload all hardware settings at once. Used at load and resume time */ @@ -29418,10 +29670,11 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ene_ir.c linux-2.6.35.x86_64.ne + +module_init(ene_init); +module_exit(ene_exit); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ene_ir.h linux-2.6.35.x86_64.new/drivers/media/rc/ene_ir.h ---- linux-2.6.35.x86_64/drivers/media/rc/ene_ir.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/ene_ir.h 2010-12-15 11:13:18.000000000 -0500 -@@ -0,0 +1,261 @@ +Index: linux-2.6.35.x86_64/drivers/media/rc/ene_ir.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/ene_ir.h +@@ -0,0 +1,259 @@ +/* + * driver for ENE KB3926 B/C/D/E/F CIR (also known as ENE0XXX) + * @@ -29625,8 +29878,6 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ene_ir.h linux-2.6.35.x86_64.ne +#define dbg_verbose(format, ...) __dbg(2, format, ## __VA_ARGS__) +#define dbg_regs(format, ...) __dbg(3, format, ## __VA_ARGS__) + -+#define MS_TO_NS(msec) ((msec) * 1000) -+ +struct ene_device { + struct pnp_dev *pnp_dev; + struct rc_dev *rdev; @@ -29683,9 +29934,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ene_ir.h linux-2.6.35.x86_64.ne + +static int ene_irq_status(struct ene_device *dev); +static void ene_rx_read_hw_pointer(struct ene_device *dev); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/imon.c linux-2.6.35.x86_64.new/drivers/media/rc/imon.c ---- linux-2.6.35.x86_64/drivers/media/rc/imon.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/imon.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/imon.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/imon.c @@ -0,0 +1,2455 @@ +/* + * imon.c: input and display driver for SoundGraph iMON IR/VFD/LCD @@ -32142,9 +32394,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/imon.c linux-2.6.35.x86_64.new/ + +module_init(imon_init); +module_exit(imon_exit); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-jvc-decoder.c linux-2.6.35.x86_64.new/drivers/media/rc/ir-jvc-decoder.c ---- linux-2.6.35.x86_64/drivers/media/rc/ir-jvc-decoder.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/ir-jvc-decoder.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/ir-jvc-decoder.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/ir-jvc-decoder.c @@ -0,0 +1,198 @@ +/* ir-jvc-decoder.c - handle JVC IR Pulse/Space protocol + * @@ -32344,9 +32597,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-jvc-decoder.c linux-2.6.35.x +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("David Härdeman "); +MODULE_DESCRIPTION("JVC IR protocol decoder"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-lirc-codec.c linux-2.6.35.x86_64.new/drivers/media/rc/ir-lirc-codec.c ---- linux-2.6.35.x86_64/drivers/media/rc/ir-lirc-codec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/ir-lirc-codec.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/ir-lirc-codec.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/ir-lirc-codec.c @@ -0,0 +1,401 @@ +/* ir-lirc-codec.c - ir-core to classic lirc interface bridge + * @@ -32749,9 +33003,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-lirc-codec.c linux-2.6.35.x8 +MODULE_AUTHOR("Jarod Wilson "); +MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)"); +MODULE_DESCRIPTION("LIRC IR handler bridge"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-nec-decoder.c linux-2.6.35.x86_64.new/drivers/media/rc/ir-nec-decoder.c ---- linux-2.6.35.x86_64/drivers/media/rc/ir-nec-decoder.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/ir-nec-decoder.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/ir-nec-decoder.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/ir-nec-decoder.c @@ -0,0 +1,216 @@ +/* ir-nec-decoder.c - handle NEC IR Pulse/Space protocol + * @@ -32969,9 +33224,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-nec-decoder.c linux-2.6.35.x +MODULE_AUTHOR("Mauro Carvalho Chehab "); +MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)"); +MODULE_DESCRIPTION("NEC IR protocol decoder"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-raw.c linux-2.6.35.x86_64.new/drivers/media/rc/ir-raw.c ---- linux-2.6.35.x86_64/drivers/media/rc/ir-raw.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/ir-raw.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/ir-raw.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/ir-raw.c @@ -0,0 +1,371 @@ +/* ir-raw.c - handle IR pulse/space events + * @@ -33344,9 +33600,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-raw.c linux-2.6.35.x86_64.ne + schedule_work(&wq_load); +#endif +} -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-rc5-decoder.c linux-2.6.35.x86_64.new/drivers/media/rc/ir-rc5-decoder.c ---- linux-2.6.35.x86_64/drivers/media/rc/ir-rc5-decoder.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/ir-rc5-decoder.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/ir-rc5-decoder.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/ir-rc5-decoder.c @@ -0,0 +1,189 @@ +/* ir-rc5-decoder.c - handle RC5(x) IR Pulse/Space protocol + * @@ -33537,9 +33794,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-rc5-decoder.c linux-2.6.35.x +MODULE_AUTHOR("Mauro Carvalho Chehab "); +MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)"); +MODULE_DESCRIPTION("RC5(x) IR protocol decoder"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-rc5-sz-decoder.c linux-2.6.35.x86_64.new/drivers/media/rc/ir-rc5-sz-decoder.c ---- linux-2.6.35.x86_64/drivers/media/rc/ir-rc5-sz-decoder.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/ir-rc5-sz-decoder.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/ir-rc5-sz-decoder.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/ir-rc5-sz-decoder.c @@ -0,0 +1,153 @@ +/* ir-rc5-sz-decoder.c - handle RC5 Streamzap IR Pulse/Space protocol + * @@ -33694,9 +33952,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-rc5-sz-decoder.c linux-2.6.3 +MODULE_AUTHOR("Jarod Wilson "); +MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)"); +MODULE_DESCRIPTION("RC5 (streamzap) IR protocol decoder"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-rc6-decoder.c linux-2.6.35.x86_64.new/drivers/media/rc/ir-rc6-decoder.c ---- linux-2.6.35.x86_64/drivers/media/rc/ir-rc6-decoder.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/ir-rc6-decoder.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/ir-rc6-decoder.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/ir-rc6-decoder.c @@ -0,0 +1,280 @@ +/* ir-rc6-decoder.c - A decoder for the RC6 IR protocol + * @@ -33978,9 +34237,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-rc6-decoder.c linux-2.6.35.x +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("David Härdeman "); +MODULE_DESCRIPTION("RC6 IR protocol decoder"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-sony-decoder.c linux-2.6.35.x86_64.new/drivers/media/rc/ir-sony-decoder.c ---- linux-2.6.35.x86_64/drivers/media/rc/ir-sony-decoder.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/ir-sony-decoder.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/ir-sony-decoder.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/ir-sony-decoder.c @@ -0,0 +1,181 @@ +/* ir-sony-decoder.c - handle Sony IR Pulse/Space protocol + * @@ -34163,9 +34423,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/ir-sony-decoder.c linux-2.6.35. +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("David Härdeman "); +MODULE_DESCRIPTION("Sony IR protocol decoder"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/Kconfig linux-2.6.35.x86_64.new/drivers/media/rc/Kconfig ---- linux-2.6.35.x86_64/drivers/media/rc/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/Kconfig 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/Kconfig +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/Kconfig @@ -0,0 +1,193 @@ +menuconfig RC_CORE + tristate "Remote Controller adapters" @@ -34360,9 +34621,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/Kconfig linux-2.6.35.x86_64.new + be called rc_loopback. + +endif #RC_CORE -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/Kconfig linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/Kconfig ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/Kconfig 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/Kconfig +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/Kconfig @@ -0,0 +1,15 @@ +config RC_MAP + tristate "Compile Remote Controller keymap modules" @@ -34379,9 +34641,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/Kconfig linux-2.6.35.x8 + provide the tool and the same RC maps for load from + userspace. Its available at + http://git.linuxtv.org/v4l-utils -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/Makefile linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/Makefile ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/Makefile 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/Makefile +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/Makefile @@ -0,0 +1,86 @@ +obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \ + rc-alink-dtu-m.o \ @@ -34469,9 +34732,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/Makefile linux-2.6.35.x + rc-videomate-tv-pvr.o \ + rc-winfast.o \ + rc-winfast-usbii-deluxe.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c @@ -0,0 +1,89 @@ +/* adstech-dvb-t-pci.h - Keytable for adstech_dvb_t_pci Remote Controller + * @@ -34562,9 +34826,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-alink-dtu-m.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-alink-dtu-m.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-alink-dtu-m.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-alink-dtu-m.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-alink-dtu-m.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-alink-dtu-m.c @@ -0,0 +1,68 @@ +/* + * A-Link DTU(m) remote controller keytable @@ -34634,9 +34899,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-alink-dtu-m.c linux- + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Antti Palosaari "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-anysee.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-anysee.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-anysee.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-anysee.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-anysee.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-anysee.c @@ -0,0 +1,93 @@ +/* + * Anysee remote controller keytable @@ -34731,9 +34997,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-anysee.c linux-2.6.3 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Antti Palosaari "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-apac-viewcomp.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-apac-viewcomp.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-apac-viewcomp.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-apac-viewcomp.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-apac-viewcomp.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-apac-viewcomp.c @@ -0,0 +1,80 @@ +/* apac-viewcomp.h - Keytable for apac_viewcomp Remote Controller + * @@ -34815,9 +35082,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-apac-viewcomp.c linu + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-asus-pc39.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-asus-pc39.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-asus-pc39.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-asus-pc39.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-asus-pc39.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-asus-pc39.c @@ -0,0 +1,91 @@ +/* asus-pc39.h - Keytable for asus_pc39 Remote Controller + * @@ -34910,9 +35178,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-asus-pc39.c linux-2. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c @@ -0,0 +1,69 @@ +/* ati-tv-wonder-hd-600.h - Keytable for ati_tv_wonder_hd_600 Remote Controller + * @@ -34983,9 +35252,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-a16d.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia-a16d.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-a16d.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia-a16d.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-a16d.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-a16d.c @@ -0,0 +1,75 @@ +/* avermedia-a16d.h - Keytable for avermedia_a16d Remote Controller + * @@ -35062,9 +35332,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-a16d.c lin + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia.c @@ -0,0 +1,86 @@ +/* avermedia.h - Keytable for avermedia Remote Controller + * @@ -35152,9 +35423,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia.c linux-2. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-cardbus.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia-cardbus.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-cardbus.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia-cardbus.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-cardbus.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-cardbus.c @@ -0,0 +1,97 @@ +/* avermedia-cardbus.h - Keytable for avermedia_cardbus Remote Controller + * @@ -35253,9 +35525,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-cardbus.c + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-dvbt.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia-dvbt.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-dvbt.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia-dvbt.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-dvbt.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-dvbt.c @@ -0,0 +1,78 @@ +/* avermedia-dvbt.h - Keytable for avermedia_dvbt Remote Controller + * @@ -35335,9 +35608,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-dvbt.c lin + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-m135a.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia-m135a.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-m135a.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia-m135a.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-m135a.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-m135a.c @@ -0,0 +1,147 @@ +/* avermedia-m135a.c - Keytable for Avermedia M135A Remote Controllers + * @@ -35486,9 +35760,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-m135a.c li + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c @@ -0,0 +1,95 @@ +/* avermedia-m733a-rm-k6.h - Keytable for avermedia_m733a_rm_k6 Remote Controller + * @@ -35585,9 +35860,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c @@ -0,0 +1,79 @@ +/* + * AverMedia RM-KS remote controller keytable @@ -35668,9 +35944,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c li + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Antti Palosaari "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avertv-303.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avertv-303.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avertv-303.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-avertv-303.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avertv-303.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avertv-303.c @@ -0,0 +1,85 @@ +/* avertv-303.h - Keytable for avertv_303 Remote Controller + * @@ -35757,9 +36034,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-avertv-303.c linux-2 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c @@ -0,0 +1,102 @@ +/* + * TwinHan AzureWave AD-TU700(704J) remote controller keytable @@ -35863,9 +36141,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Antti Palosaari "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-behold.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-behold.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-behold.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-behold.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-behold.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-behold.c @@ -0,0 +1,141 @@ +/* behold.h - Keytable for behold Remote Controller + * @@ -36008,9 +36287,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-behold.c linux-2.6.3 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-behold-columbus.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-behold-columbus.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-behold-columbus.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-behold-columbus.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-behold-columbus.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-behold-columbus.c @@ -0,0 +1,108 @@ +/* behold-columbus.h - Keytable for behold_columbus Remote Controller + * @@ -36120,9 +36400,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-behold-columbus.c li + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-budget-ci-old.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-budget-ci-old.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-budget-ci-old.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-budget-ci-old.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-budget-ci-old.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-budget-ci-old.c @@ -0,0 +1,92 @@ +/* budget-ci-old.h - Keytable for budget_ci_old Remote Controller + * @@ -36216,9 +36497,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-budget-ci-old.c linu + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-cinergy-1400.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-cinergy-1400.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-cinergy-1400.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-cinergy-1400.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-cinergy-1400.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-cinergy-1400.c @@ -0,0 +1,84 @@ +/* cinergy-1400.h - Keytable for cinergy_1400 Remote Controller + * @@ -36304,9 +36586,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-cinergy-1400.c linux + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-cinergy.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-cinergy.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-cinergy.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-cinergy.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-cinergy.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-cinergy.c @@ -0,0 +1,78 @@ +/* cinergy.h - Keytable for cinergy Remote Controller + * @@ -36386,9 +36669,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-cinergy.c linux-2.6. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dib0700-nec.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-dib0700-nec.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dib0700-nec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-dib0700-nec.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dib0700-nec.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dib0700-nec.c @@ -0,0 +1,124 @@ +/* rc-dvb0700-big.c - Keytable for devices in dvb0700 + * @@ -36514,9 +36798,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dib0700-nec.c linux- + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dib0700-rc5.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-dib0700-rc5.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dib0700-rc5.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-dib0700-rc5.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dib0700-rc5.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dib0700-rc5.c @@ -0,0 +1,235 @@ +/* rc-dvb0700-big.c - Keytable for devices in dvb0700 + * @@ -36753,9 +37038,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dib0700-rc5.c linux- + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c @@ -0,0 +1,98 @@ +/* + * DigitalNow TinyTwin remote controller keytable @@ -36855,9 +37141,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-digitalnow-tinytwin. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Antti Palosaari "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-digittrade.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-digittrade.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-digittrade.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-digittrade.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-digittrade.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-digittrade.c @@ -0,0 +1,82 @@ +/* + * Digittrade DVB-T USB Stick remote controller keytable @@ -36941,9 +37228,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-digittrade.c linux-2 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Antti Palosaari "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dm1105-nec.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-dm1105-nec.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dm1105-nec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-dm1105-nec.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dm1105-nec.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dm1105-nec.c @@ -0,0 +1,76 @@ +/* dm1105-nec.h - Keytable for dm1105_nec Remote Controller + * @@ -37021,9 +37309,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dm1105-nec.c linux-2 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c @@ -0,0 +1,78 @@ +/* dntv-live-dvb-t.h - Keytable for dntv_live_dvb_t Remote Controller + * @@ -37103,9 +37392,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c li + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c @@ -0,0 +1,97 @@ +/* dntv-live-dvbt-pro.h - Keytable for dntv_live_dvbt_pro Remote Controller + * @@ -37204,9 +37494,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-em-terratec.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-em-terratec.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-em-terratec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-em-terratec.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-em-terratec.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-em-terratec.c @@ -0,0 +1,69 @@ +/* em-terratec.h - Keytable for em_terratec Remote Controller + * @@ -37277,9 +37568,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-em-terratec.c linux- + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv2.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-encore-enltv2.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv2.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-encore-enltv2.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv2.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv2.c @@ -0,0 +1,90 @@ +/* encore-enltv2.h - Keytable for encore_enltv2 Remote Controller + * @@ -37371,9 +37663,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv2.c linu + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-encore-enltv.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-encore-enltv.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv.c @@ -0,0 +1,112 @@ +/* encore-enltv.h - Keytable for encore_enltv Remote Controller + * @@ -37487,9 +37780,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv.c linux + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c @@ -0,0 +1,81 @@ +/* encore-enltv-fm53.h - Keytable for encore_enltv_fm53 Remote Controller + * @@ -37572,9 +37866,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-evga-indtube.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-evga-indtube.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-evga-indtube.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-evga-indtube.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-evga-indtube.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-evga-indtube.c @@ -0,0 +1,61 @@ +/* evga-indtube.h - Keytable for evga_indtube Remote Controller + * @@ -37637,9 +37932,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-evga-indtube.c linux + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-eztv.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-eztv.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-eztv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-eztv.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-eztv.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-eztv.c @@ -0,0 +1,96 @@ +/* eztv.h - Keytable for eztv Remote Controller + * @@ -37737,9 +38033,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-eztv.c linux-2.6.35. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-flydvb.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-flydvb.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-flydvb.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-flydvb.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-flydvb.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-flydvb.c @@ -0,0 +1,77 @@ +/* flydvb.h - Keytable for flydvb Remote Controller + * @@ -37818,9 +38115,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-flydvb.c linux-2.6.3 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-flyvideo.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-flyvideo.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-flyvideo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-flyvideo.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-flyvideo.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-flyvideo.c @@ -0,0 +1,70 @@ +/* flyvideo.h - Keytable for flyvideo Remote Controller + * @@ -37892,9 +38190,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-flyvideo.c linux-2.6 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c @@ -0,0 +1,98 @@ +/* fusionhdtv-mce.h - Keytable for fusionhdtv_mce Remote Controller + * @@ -37994,9 +38293,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c lin + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-gadmei-rm008z.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-gadmei-rm008z.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-gadmei-rm008z.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-gadmei-rm008z.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-gadmei-rm008z.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-gadmei-rm008z.c @@ -0,0 +1,81 @@ +/* gadmei-rm008z.h - Keytable for gadmei_rm008z Remote Controller + * @@ -38079,9 +38379,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-gadmei-rm008z.c linu + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c @@ -0,0 +1,84 @@ +/* genius-tvgo-a11mce.h - Keytable for genius_tvgo_a11mce Remote Controller + * @@ -38167,9 +38468,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-gotview7135.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-gotview7135.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-gotview7135.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-gotview7135.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-gotview7135.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-gotview7135.c @@ -0,0 +1,79 @@ +/* gotview7135.h - Keytable for gotview7135 Remote Controller + * @@ -38250,9 +38552,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-gotview7135.c linux- + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-hauppauge-new.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-hauppauge-new.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-hauppauge-new.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-hauppauge-new.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-hauppauge-new.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-hauppauge-new.c @@ -0,0 +1,100 @@ +/* hauppauge-new.h - Keytable for hauppauge_new Remote Controller + * @@ -38354,9 +38657,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-hauppauge-new.c linu + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-imon-mce.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-imon-mce.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-imon-mce.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-imon-mce.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-imon-mce.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-imon-mce.c @@ -0,0 +1,142 @@ +/* rc5-imon-mce.c - Keytable for Windows Media Center RC-6 remotes for use + * with the SoundGraph iMON/Antec Veris hardware IR decoder @@ -38500,9 +38804,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-imon-mce.c linux-2.6 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Jarod Wilson "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-imon-pad.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-imon-pad.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-imon-pad.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-imon-pad.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-imon-pad.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-imon-pad.c @@ -0,0 +1,156 @@ +/* rc5-imon-pad.c - Keytable for SoundGraph iMON PAD and Antec Veris + * RM-200 Remote Control @@ -38660,9 +38965,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-imon-pad.c linux-2.6 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Jarod Wilson "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-iodata-bctv7e.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-iodata-bctv7e.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-iodata-bctv7e.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-iodata-bctv7e.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-iodata-bctv7e.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-iodata-bctv7e.c @@ -0,0 +1,88 @@ +/* iodata-bctv7e.h - Keytable for iodata_bctv7e Remote Controller + * @@ -38752,9 +39058,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-iodata-bctv7e.c linu + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kaiomy.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-kaiomy.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kaiomy.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-kaiomy.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kaiomy.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kaiomy.c @@ -0,0 +1,87 @@ +/* kaiomy.h - Keytable for kaiomy Remote Controller + * @@ -38843,9 +39150,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kaiomy.c linux-2.6.3 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kworld-315u.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-kworld-315u.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kworld-315u.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-kworld-315u.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kworld-315u.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kworld-315u.c @@ -0,0 +1,83 @@ +/* kworld-315u.h - Keytable for kworld_315u Remote Controller + * @@ -38930,9 +39238,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kworld-315u.c linux- + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c @@ -0,0 +1,99 @@ +/* kworld-plus-tv-analog.h - Keytable for kworld_plus_tv_analog Remote Controller + * @@ -39033,9 +39342,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-kworld-plus-tv-analo + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c @@ -0,0 +1,99 @@ +/* + * LeadTek Y04G0051 remote controller keytable @@ -39136,9 +39446,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c l + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Antti Palosaari "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-lirc.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-lirc.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-lirc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-lirc.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-lirc.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-lirc.c @@ -0,0 +1,41 @@ +/* rc-lirc.c - Empty dummy keytable, for use when its preferred to pass + * all raw IR data to the lirc userspace decoder. @@ -39181,9 +39492,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-lirc.c linux-2.6.35. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Jarod Wilson "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-lme2510.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-lme2510.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-lme2510.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-lme2510.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-lme2510.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-lme2510.c @@ -0,0 +1,68 @@ +/* LME2510 remote control + * @@ -39253,9 +39565,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-lme2510.c linux-2.6. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Malcolm Priestley tvboxspy@gmail.com"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-manli.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-manli.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-manli.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-manli.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-manli.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-manli.c @@ -0,0 +1,134 @@ +/* manli.h - Keytable for manli Remote Controller + * @@ -39391,9 +39704,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-manli.c linux-2.6.35 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-digivox-ii.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-msi-digivox-ii.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-digivox-ii.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-msi-digivox-ii.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-digivox-ii.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-digivox-ii.c @@ -0,0 +1,67 @@ +/* + * MSI DIGIVOX mini II remote controller keytable @@ -39462,9 +39776,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-digivox-ii.c lin + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Antti Palosaari "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-digivox-iii.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-msi-digivox-iii.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-digivox-iii.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-msi-digivox-iii.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-digivox-iii.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-digivox-iii.c @@ -0,0 +1,85 @@ +/* + * MSI DIGIVOX mini III remote controller keytable @@ -39551,9 +39866,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-digivox-iii.c li + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Antti Palosaari "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-tvanywhere.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-msi-tvanywhere.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-tvanywhere.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-msi-tvanywhere.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-tvanywhere.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-tvanywhere.c @@ -0,0 +1,69 @@ +/* msi-tvanywhere.h - Keytable for msi_tvanywhere Remote Controller + * @@ -39624,9 +39940,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-tvanywhere.c lin + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c @@ -0,0 +1,123 @@ +/* msi-tvanywhere-plus.h - Keytable for msi_tvanywhere_plus Remote Controller + * @@ -39751,9 +40068,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-nebula.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-nebula.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-nebula.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-nebula.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-nebula.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-nebula.c @@ -0,0 +1,96 @@ +/* nebula.h - Keytable for nebula Remote Controller + * @@ -39851,9 +40169,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-nebula.c linux-2.6.3 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c @@ -0,0 +1,105 @@ +/* nec-terratec-cinergy-xs.h - Keytable for nec_terratec_cinergy_xs Remote Controller + * @@ -39960,9 +40279,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-nec-terratec-cinergy + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-norwood.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-norwood.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-norwood.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-norwood.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-norwood.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-norwood.c @@ -0,0 +1,85 @@ +/* norwood.h - Keytable for norwood Remote Controller + * @@ -40049,9 +40369,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-norwood.c linux-2.6. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-npgtech.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-npgtech.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-npgtech.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-npgtech.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-npgtech.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-npgtech.c @@ -0,0 +1,80 @@ +/* npgtech.h - Keytable for npgtech Remote Controller + * @@ -40133,9 +40454,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-npgtech.c linux-2.6. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pctv-sedna.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pctv-sedna.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pctv-sedna.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pctv-sedna.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pctv-sedna.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pctv-sedna.c @@ -0,0 +1,80 @@ +/* pctv-sedna.h - Keytable for pctv_sedna Remote Controller + * @@ -40217,9 +40539,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pctv-sedna.c linux-2 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-color.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pinnacle-color.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-color.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pinnacle-color.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-color.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-color.c @@ -0,0 +1,94 @@ +/* pinnacle-color.h - Keytable for pinnacle_color Remote Controller + * @@ -40315,9 +40638,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-color.c lin + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-grey.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pinnacle-grey.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-grey.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pinnacle-grey.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-grey.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-grey.c @@ -0,0 +1,89 @@ +/* pinnacle-grey.h - Keytable for pinnacle_grey Remote Controller + * @@ -40408,9 +40732,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-grey.c linu + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c @@ -0,0 +1,73 @@ +/* pinnacle-pctv-hd.h - Keytable for pinnacle_pctv_hd Remote Controller + * @@ -40485,9 +40810,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c l + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pixelview.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pixelview.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview.c @@ -0,0 +1,82 @@ +/* pixelview.h - Keytable for pixelview Remote Controller + * @@ -40571,9 +40897,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview.c linux-2. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview-mk12.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pixelview-mk12.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview-mk12.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pixelview-mk12.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview-mk12.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview-mk12.c @@ -0,0 +1,83 @@ +/* rc-pixelview-mk12.h - Keytable for pixelview Remote Controller + * @@ -40658,9 +40985,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview-mk12.c lin + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview-new.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pixelview-new.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview-new.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pixelview-new.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview-new.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview-new.c @@ -0,0 +1,83 @@ +/* pixelview-new.h - Keytable for pixelview_new Remote Controller + * @@ -40745,9 +41073,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pixelview-new.c linu + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-powercolor-real-angel.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-powercolor-real-angel.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-powercolor-real-angel.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-powercolor-real-angel.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-powercolor-real-angel.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-powercolor-real-angel.c @@ -0,0 +1,81 @@ +/* powercolor-real-angel.h - Keytable for powercolor_real_angel Remote Controller + * @@ -40830,9 +41159,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-powercolor-real-ange + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-proteus-2309.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-proteus-2309.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-proteus-2309.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-proteus-2309.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-proteus-2309.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-proteus-2309.c @@ -0,0 +1,69 @@ +/* proteus-2309.h - Keytable for proteus_2309 Remote Controller + * @@ -40903,9 +41233,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-proteus-2309.c linux + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-purpletv.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-purpletv.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-purpletv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-purpletv.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-purpletv.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-purpletv.c @@ -0,0 +1,81 @@ +/* purpletv.h - Keytable for purpletv Remote Controller + * @@ -40988,9 +41319,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-purpletv.c linux-2.6 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pv951.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pv951.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pv951.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-pv951.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pv951.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pv951.c @@ -0,0 +1,78 @@ +/* pv951.h - Keytable for pv951 Remote Controller + * @@ -41070,9 +41402,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-pv951.c linux-2.6.35 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c @@ -0,0 +1,141 @@ +/* rc5-hauppauge-new.h - Keytable for rc5_hauppauge_new Remote Controller + * @@ -41215,9 +41548,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc5-tv.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-rc5-tv.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc5-tv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-rc5-tv.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc5-tv.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc5-tv.c @@ -0,0 +1,81 @@ +/* rc5-tv.h - Keytable for rc5_tv Remote Controller + * @@ -41300,9 +41634,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc5-tv.c linux-2.6.3 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc6-mce.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-rc6-mce.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc6-mce.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-rc6-mce.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc6-mce.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc6-mce.c @@ -0,0 +1,113 @@ +/* rc-rc6-mce.c - Keytable for Windows Media Center RC-6 remotes for use + * with the Media Center Edition eHome Infrared Transceiver. @@ -41417,9 +41752,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-rc6-mce.c linux-2.6. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Jarod Wilson "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c @@ -0,0 +1,78 @@ +/* real-audio-220-32-keys.h - Keytable for real_audio_220_32_keys Remote Controller + * @@ -41499,9 +41835,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-real-audio-220-32-ke + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-streamzap.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-streamzap.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-streamzap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-streamzap.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-streamzap.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-streamzap.c @@ -0,0 +1,82 @@ +/* rc-streamzap.c - Keytable for Streamzap PC Remote, for use + * with the Streamzap PC Remote IR Receiver. @@ -41585,9 +41922,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-streamzap.c linux-2. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Jarod Wilson "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tbs-nec.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-tbs-nec.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tbs-nec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-tbs-nec.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tbs-nec.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tbs-nec.c @@ -0,0 +1,75 @@ +/* tbs-nec.h - Keytable for tbs_nec Remote Controller + * @@ -41664,9 +42002,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tbs-nec.c linux-2.6. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c @@ -0,0 +1,92 @@ +/* terratec-cinergy-xs.h - Keytable for terratec_cinergy_xs Remote Controller + * @@ -41760,9 +42099,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-terratec-cinergy-xs. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-terratec-slim.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-terratec-slim.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-terratec-slim.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-terratec-slim.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-terratec-slim.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-terratec-slim.c @@ -0,0 +1,79 @@ +/* + * TerraTec remote controller keytable @@ -41843,9 +42183,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-terratec-slim.c linu + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Antti Palosaari "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tevii-nec.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-tevii-nec.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tevii-nec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-tevii-nec.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tevii-nec.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tevii-nec.c @@ -0,0 +1,88 @@ +/* tevii-nec.h - Keytable for tevii_nec Remote Controller + * @@ -41935,9 +42276,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tevii-nec.c linux-2. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-total-media-in-hand.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-total-media-in-hand.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-total-media-in-hand.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-total-media-in-hand.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-total-media-in-hand.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-total-media-in-hand.c @@ -0,0 +1,85 @@ +/* + * Total Media In Hand remote controller keytable @@ -42024,9 +42366,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-total-media-in-hand. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Antti Palosaari "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-trekstor.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-trekstor.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-trekstor.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-trekstor.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-trekstor.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-trekstor.c @@ -0,0 +1,80 @@ +/* + * TrekStor remote controller keytable @@ -42108,9 +42451,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-trekstor.c linux-2.6 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Antti Palosaari "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tt-1500.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-tt-1500.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tt-1500.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-tt-1500.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tt-1500.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tt-1500.c @@ -0,0 +1,82 @@ +/* tt-1500.h - Keytable for tt_1500 Remote Controller + * @@ -42194,9 +42538,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-tt-1500.c linux-2.6. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-twinhan1027.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-twinhan1027.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-twinhan1027.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-twinhan1027.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-twinhan1027.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-twinhan1027.c @@ -0,0 +1,87 @@ +#include + @@ -42285,9 +42630,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-twinhan1027.c linux- + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Sergey Ivanov <123kash@gmail.com>"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-videomate-s350.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-videomate-s350.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-videomate-s350.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-videomate-s350.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-videomate-s350.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-videomate-s350.c @@ -0,0 +1,85 @@ +/* videomate-s350.h - Keytable for videomate_s350 Remote Controller + * @@ -42374,9 +42720,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-videomate-s350.c lin + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c @@ -0,0 +1,87 @@ +/* videomate-tv-pvr.h - Keytable for videomate_tv_pvr Remote Controller + * @@ -42465,9 +42812,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c l + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-winfast.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-winfast.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-winfast.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-winfast.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-winfast.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-winfast.c @@ -0,0 +1,102 @@ +/* winfast.h - Keytable for winfast Remote Controller + * @@ -42571,9 +42919,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-winfast.c linux-2.6. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c ---- linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c @@ -0,0 +1,82 @@ +/* winfast-usbii-deluxe.h - Keytable for winfast_usbii_deluxe Remote Controller + * @@ -42657,9 +43006,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mauro Carvalho Chehab "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/lirc_dev.c linux-2.6.35.x86_64.new/drivers/media/rc/lirc_dev.c ---- linux-2.6.35.x86_64/drivers/media/rc/lirc_dev.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/lirc_dev.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/lirc_dev.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/lirc_dev.c @@ -0,0 +1,815 @@ +/* + * LIRC base driver @@ -43476,9 +43826,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/lirc_dev.c linux-2.6.35.x86_64. + +module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/Makefile linux-2.6.35.x86_64.new/drivers/media/rc/Makefile ---- linux-2.6.35.x86_64/drivers/media/rc/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/Makefile 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/Makefile +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/Makefile @@ -0,0 +1,22 @@ +rc-core-objs := rc-main.o ir-raw.o + @@ -43502,10 +43853,11 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/Makefile linux-2.6.35.x86_64.ne +obj-$(CONFIG_IR_STREAMZAP) += streamzap.o +obj-$(CONFIG_IR_WINBOND_CIR) += winbond-cir.o +obj-$(CONFIG_RC_LOOPBACK) += rc-loopback.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/mceusb.c linux-2.6.35.x86_64.new/drivers/media/rc/mceusb.c ---- linux-2.6.35.x86_64/drivers/media/rc/mceusb.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/mceusb.c 2010-12-15 11:13:18.000000000 -0500 -@@ -0,0 +1,1310 @@ +Index: linux-2.6.35.x86_64/drivers/media/rc/mceusb.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/mceusb.c +@@ -0,0 +1,1312 @@ +/* + * Driver for USB Windows Media Center Ed. eHome Infrared Transceivers + * @@ -43556,7 +43908,6 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/mceusb.c linux-2.6.35.x86_64.ne +#define USB_BUFLEN 32 /* USB reception buffer length */ +#define USB_CTRL_MSG_SZ 2 /* Size of usb ctrl msg on gen1 hw */ +#define MCE_G1_INIT_MSGS 40 /* Init messages on gen1 hw to throw out */ -+#define MS_TO_NS(msec) ((msec) * 1000) + +/* MCE constants */ +#define MCE_CMDBUF_SIZE 384 /* MCE Command buffer length */ @@ -43790,6 +44141,8 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/mceusb.c linux-2.6.35.x86_64.ne + { USB_DEVICE(VENDOR_FORMOSA, 0xe03c) }, + /* Formosa Industrial Computing */ + { USB_DEVICE(VENDOR_FORMOSA, 0xe03e) }, ++ /* Fintek eHome Infrared Transceiver (HP branded) */ ++ { USB_DEVICE(VENDOR_FINTEK, 0x5168) }, + /* Fintek eHome Infrared Transceiver */ + { USB_DEVICE(VENDOR_FINTEK, 0x0602) }, + /* Fintek eHome Infrared Transceiver (in the AOpen MP45) */ @@ -44323,7 +44676,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/mceusb.c linux-2.6.35.x86_64.ne + switch (ir->buf_in[index]) { + /* 2-byte return value commands */ + case MCE_CMD_S_TIMEOUT: -+ ir->rc->timeout = MS_TO_NS((hi << 8 | lo) / 2); ++ ir->rc->timeout = MS_TO_US((hi << 8 | lo) / 2); + break; + + /* 1-byte return value commands */ @@ -44364,7 +44717,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/mceusb.c linux-2.6.35.x86_64.ne + ir->rem--; + rawir.pulse = ((ir->buf_in[i] & MCE_PULSE_BIT) != 0); + rawir.duration = (ir->buf_in[i] & MCE_PULSE_MASK) -+ * MS_TO_NS(MCE_TIME_UNIT); ++ * MS_TO_US(MCE_TIME_UNIT); + + dev_dbg(ir->dev, "Storing %s with duration %d\n", + rawir.pulse ? "pulse" : "space", @@ -44567,6 +44920,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/mceusb.c linux-2.6.35.x86_64.ne + rc->priv = ir; + rc->driver_type = RC_DRIVER_IR_RAW; + rc->allowed_protos = RC_TYPE_ALL; ++ rc->timeout = MS_TO_US(1000); + if (!ir->flags.no_tx) { + rc->s_tx_mask = mceusb_set_tx_mask; + rc->s_tx_carrier = mceusb_set_tx_carrier; @@ -44816,9 +45170,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/mceusb.c linux-2.6.35.x86_64.ne + +module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug enabled or not"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/nuvoton-cir.c linux-2.6.35.x86_64.new/drivers/media/rc/nuvoton-cir.c ---- linux-2.6.35.x86_64/drivers/media/rc/nuvoton-cir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/nuvoton-cir.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/nuvoton-cir.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/nuvoton-cir.c @@ -0,0 +1,1244 @@ +/* + * Driver for Nuvoton Technology Corporation w83667hg/w83677hg-i CIR @@ -46064,9 +46419,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/nuvoton-cir.c linux-2.6.35.x86_ + +module_init(nvt_init); +module_exit(nvt_exit); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/nuvoton-cir.h linux-2.6.35.x86_64.new/drivers/media/rc/nuvoton-cir.h ---- linux-2.6.35.x86_64/drivers/media/rc/nuvoton-cir.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/nuvoton-cir.h 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/nuvoton-cir.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/nuvoton-cir.h @@ -0,0 +1,407 @@ +/* + * Driver for Nuvoton Technology Corporation w83667hg/w83677hg-i CIR @@ -46475,9 +46831,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/nuvoton-cir.h linux-2.6.35.x86_ +/* as VISTA MCE definition, valid carrier value */ +#define MAX_CARRIER 60000 +#define MIN_CARRIER 30000 -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/rc-core-priv.h linux-2.6.35.x86_64.new/drivers/media/rc/rc-core-priv.h ---- linux-2.6.35.x86_64/drivers/media/rc/rc-core-priv.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/rc-core-priv.h 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/rc-core-priv.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/rc-core-priv.h @@ -0,0 +1,193 @@ +/* + * Remote Controller core raw events header @@ -46672,9 +47029,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/rc-core-priv.h linux-2.6.35.x86 + + +#endif /* _RC_CORE_PRIV */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/rc-loopback.c linux-2.6.35.x86_64.new/drivers/media/rc/rc-loopback.c ---- linux-2.6.35.x86_64/drivers/media/rc/rc-loopback.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/rc-loopback.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/rc-loopback.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/rc-loopback.c @@ -0,0 +1,260 @@ +/* + * Loopback driver for rc-core, @@ -46936,9 +47294,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/rc-loopback.c linux-2.6.35.x86_ +MODULE_DESCRIPTION("Loopback device for rc-core debugging"); +MODULE_AUTHOR("David Härdeman "); +MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/rc-main.c linux-2.6.35.x86_64.new/drivers/media/rc/rc-main.c ---- linux-2.6.35.x86_64/drivers/media/rc/rc-main.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/rc-main.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/rc-main.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/rc-main.c @@ -0,0 +1,1103 @@ +/* rc-main.c - Remote Controller core module + * @@ -48043,9 +48402,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/rc-main.c linux-2.6.35.x86_64.n + +MODULE_AUTHOR("Mauro Carvalho Chehab "); +MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/streamzap.c linux-2.6.35.x86_64.new/drivers/media/rc/streamzap.c ---- linux-2.6.35.x86_64/drivers/media/rc/streamzap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/streamzap.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/streamzap.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/streamzap.c @@ -0,0 +1,557 @@ +/* + * Streamzap Remote Control driver @@ -48604,9 +48964,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/streamzap.c linux-2.6.35.x86_64 + +module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/winbond-cir.c linux-2.6.35.x86_64.new/drivers/media/rc/winbond-cir.c ---- linux-2.6.35.x86_64/drivers/media/rc/winbond-cir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/rc/winbond-cir.c 2010-12-15 11:13:18.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/rc/winbond-cir.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/rc/winbond-cir.c @@ -0,0 +1,932 @@ +/* + * winbond-cir.c - Driver for the Consumer IR functionality of Winbond @@ -49540,9 +49901,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/rc/winbond-cir.c linux-2.6.35.x86_ +MODULE_AUTHOR("David H�rdeman "); +MODULE_DESCRIPTION("Winbond SuperI/O Consumer IR Driver"); +MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/adv7170.c linux-2.6.35.x86_64.new/drivers/media/video/adv7170.c ---- linux-2.6.35.x86_64/drivers/media/video/adv7170.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/adv7170.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/adv7170.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/adv7170.c ++++ linux-2.6.35.x86_64/drivers/media/video/adv7170.c @@ -34,11 +34,9 @@ #include #include @@ -49586,9 +49948,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/adv7170.c linux-2.6.35.x86_6 + +module_init(init_adv7170); +module_exit(exit_adv7170); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/adv7175.c linux-2.6.35.x86_64.new/drivers/media/video/adv7175.c ---- linux-2.6.35.x86_64/drivers/media/video/adv7175.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/adv7175.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/adv7175.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/adv7175.c ++++ linux-2.6.35.x86_64/drivers/media/video/adv7175.c @@ -30,11 +30,9 @@ #include #include @@ -49632,9 +49995,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/adv7175.c linux-2.6.35.x86_6 + +module_init(init_adv7175); +module_exit(exit_adv7175); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/adv7180.c linux-2.6.35.x86_64.new/drivers/media/video/adv7180.c ---- linux-2.6.35.x86_64/drivers/media/video/adv7180.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/adv7180.c 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/adv7180.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/adv7180.c ++++ linux-2.6.35.x86_64/drivers/media/video/adv7180.c @@ -22,7 +22,6 @@ #include #include @@ -49643,9 +50007,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/adv7180.c linux-2.6.35.x86_6 #include #include #include -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ak881x.c linux-2.6.35.x86_64.new/drivers/media/video/ak881x.c ---- linux-2.6.35.x86_64/drivers/media/video/ak881x.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ak881x.c 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ak881x.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ak881x.c ++++ linux-2.6.35.x86_64/drivers/media/video/ak881x.c @@ -126,7 +126,7 @@ static int ak881x_try_g_mbus_fmt(struct v4l_bound_align_image(&mf->width, 0, 720, 2, &mf->height, 0, ak881x->lines, 1, 0); @@ -49673,9 +50038,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ak881x.c linux-2.6.35.x86_64 return 0; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-cards.c linux-2.6.35.x86_64.new/drivers/media/video/au0828/au0828-cards.c ---- linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/au0828/au0828-cards.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/au0828/au0828-cards.c ++++ linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-cards.c @@ -212,7 +212,7 @@ void au0828_card_setup(struct au0828_dev be abstracted out if we ever need to support a different demod) */ @@ -49694,9 +50060,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-cards.c linux- if (sd == NULL) printk(KERN_ERR "tuner subdev registration fail\n"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/au0828/au0828.h linux-2.6.35.x86_64.new/drivers/media/video/au0828/au0828.h ---- linux-2.6.35.x86_64/drivers/media/video/au0828/au0828.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/au0828/au0828.h 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/au0828/au0828.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/au0828/au0828.h ++++ linux-2.6.35.x86_64/drivers/media/video/au0828/au0828.h @@ -53,13 +53,17 @@ /* Defination for AU0828 USB transfer */ @@ -49776,9 +50143,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/au0828/au0828.h linux-2.6.35 #define dprintk(level, fmt, arg...)\ do { if (au0828_debug & level)\ printk(KERN_DEBUG DRIVER_NAME "/0: " fmt, ## arg);\ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-vbi.c linux-2.6.35.x86_64.new/drivers/media/video/au0828/au0828-vbi.c ---- linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-vbi.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/au0828/au0828-vbi.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-vbi.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-vbi.c @@ -0,0 +1,138 @@ +/* + au0828-vbi.c - VBI driver for au0828 @@ -49918,9 +50286,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-vbi.c linux-2. + .buf_queue = vbi_queue, + .buf_release = vbi_release, +}; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-video.c linux-2.6.35.x86_64.new/drivers/media/video/au0828/au0828-video.c ---- linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-video.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/au0828/au0828-video.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/au0828/au0828-video.c ++++ linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-video.c @@ -122,6 +122,7 @@ static void au0828_irq_callback(struct u { struct au0828_dmaqueue *dma_q = urb->context; @@ -50761,18 +51130,20 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/au0828/au0828-video.c linux- dprintk(1, "%s completed!\n", __func__); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/au0828/Makefile linux-2.6.35.x86_64.new/drivers/media/video/au0828/Makefile ---- linux-2.6.35.x86_64/drivers/media/video/au0828/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/au0828/Makefile 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/au0828/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/au0828/Makefile ++++ linux-2.6.35.x86_64/drivers/media/video/au0828/Makefile @@ -1,4 +1,4 @@ -au0828-objs := au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o au0828-video.o +au0828-objs := au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o au0828-video.o au0828-vbi.o obj-$(CONFIG_VIDEO_AU0828) += au0828.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt819.c linux-2.6.35.x86_64.new/drivers/media/video/bt819.c ---- linux-2.6.35.x86_64/drivers/media/video/bt819.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/bt819.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/bt819.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/bt819.c ++++ linux-2.6.35.x86_64/drivers/media/video/bt819.c @@ -33,12 +33,10 @@ #include #include @@ -50817,9 +51188,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt819.c linux-2.6.35.x86_64. + +module_init(init_bt819); +module_exit(exit_bt819); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt856.c linux-2.6.35.x86_64.new/drivers/media/video/bt856.c ---- linux-2.6.35.x86_64/drivers/media/video/bt856.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/bt856.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/bt856.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/bt856.c ++++ linux-2.6.35.x86_64/drivers/media/video/bt856.c @@ -34,11 +34,9 @@ #include #include @@ -50863,9 +51235,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt856.c linux-2.6.35.x86_64. + +module_init(init_bt856); +module_exit(exit_bt856); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt866.c linux-2.6.35.x86_64.new/drivers/media/video/bt866.c ---- linux-2.6.35.x86_64/drivers/media/video/bt866.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/bt866.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/bt866.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/bt866.c ++++ linux-2.6.35.x86_64/drivers/media/video/bt866.c @@ -34,11 +34,9 @@ #include #include @@ -50909,9 +51282,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt866.c linux-2.6.35.x86_64. + +module_init(init_bt866); +module_exit(exit_bt866); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-cards.c linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttv-cards.c ---- linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttv-cards.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/bt8xx/bttv-cards.c ++++ linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-cards.c @@ -3529,7 +3529,7 @@ void __devinit bttv_init_card2(struct bt struct v4l2_subdev *sd; @@ -50995,9 +51369,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-cards.c linux-2.6 0, v4l2_i2c_tuner_addrs(ADDRS_TV_WITH_DEMOD)); tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-driver.c linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttv-driver.c ---- linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-driver.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttv-driver.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-driver.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/bt8xx/bttv-driver.c ++++ linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-driver.c @@ -842,7 +842,7 @@ static const struct v4l2_queryctrl *ctrl RESOURCE_OVERLAY) @@ -51790,9 +52165,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-driver.c linux-2. bttv_input_fini(btv); bttv_sub_del_devices(&btv->c); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv.h linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttv.h ---- linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttv.h 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/bt8xx/bttv.h ++++ linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv.h @@ -17,8 +17,6 @@ #include #include @@ -51802,9 +52178,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv.h linux-2.6.35.x8 #include #include -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-i2c.c linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttv-i2c.c ---- linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttv-i2c.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/bt8xx/bttv-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-i2c.c @@ -121,9 +121,8 @@ bttv_i2c_wait_done(struct bttv *btv) /* timeout */ @@ -51859,9 +52236,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-i2c.c linux-2.6.3 - * c-basic-offset: 8 - * End: - */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-input.c linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttv-input.c ---- linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-input.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttv-input.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-input.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/bt8xx/bttv-input.c ++++ linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-input.c @@ -31,15 +31,9 @@ static int ir_debug; @@ -52345,9 +52723,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-input.c linux-2.6 - * c-basic-offset: 8 - * End: - */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttvp.h linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttvp.h ---- linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttvp.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttvp.h 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttvp.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/bt8xx/bttvp.h ++++ linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttvp.h @@ -41,8 +41,8 @@ #include #include @@ -52448,9 +52827,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttvp.h linux-2.6.35.x /* locking */ spinlock_t s_lock; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-risc.c linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttv-risc.c ---- linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-risc.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/bttv-risc.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-risc.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/bt8xx/bttv-risc.c ++++ linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-risc.c @@ -582,8 +582,8 @@ bttv_dma_free(struct videobuf_queue *q,s struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); @@ -52462,9 +52842,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/bttv-risc.c linux-2.6. videobuf_dma_free(dma); btcx_riscmem_free(btv->c.pci,&buf->bottom); btcx_riscmem_free(btv->c.pci,&buf->top); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/bt8xx/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/bt8xx/Kconfig 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/bt8xx/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/bt8xx/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/bt8xx/Kconfig @@ -1,10 +1,10 @@ config VIDEO_BT848 tristate "BT848 Video For Linux" @@ -52478,9 +52859,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/bt8xx/Kconfig linux-2.6.35.x select VIDEO_TUNER select VIDEO_TVEEPROM select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cafe_ccic.c linux-2.6.35.x86_64.new/drivers/media/video/cafe_ccic.c ---- linux-2.6.35.x86_64/drivers/media/video/cafe_ccic.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cafe_ccic.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cafe_ccic.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cafe_ccic.c ++++ linux-2.6.35.x86_64/drivers/media/video/cafe_ccic.c @@ -4,7 +4,7 @@ * sensor. * @@ -52843,9 +53225,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cafe_ccic.c linux-2.6.35.x86 } mutex_unlock(&cam->s_mutex); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2_core.c linux-2.6.35.x86_64.new/drivers/media/video/cpia2/cpia2_core.c ---- linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2_core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cpia2/cpia2_core.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2_core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cpia2/cpia2_core.c ++++ linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2_core.c @@ -1058,44 +1058,44 @@ static int set_vw_size(struct camera_dat DBG("Setting size to VGA\n"); cam->params.roi.width = STV_IMAGE_VGA_COLS; @@ -52942,9 +53325,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2_core.c linux-2.6 } /****************************************************************************** -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2dev.h linux-2.6.35.x86_64.new/drivers/media/video/cpia2/cpia2dev.h ---- linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2dev.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cpia2/cpia2dev.h 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2dev.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cpia2/cpia2dev.h ++++ linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2dev.h @@ -29,14 +29,14 @@ #ifndef CPIA2_DEV_HEADER #define CPIA2_DEV_HEADER @@ -52962,9 +53346,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2dev.h linux-2.6.3 /* V4L2 driver specific controls */ #define CPIA2_CID_TARGET_KB (V4L2_CID_PRIVATE_BASE+0) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2.h linux-2.6.35.x86_64.new/drivers/media/video/cpia2/cpia2.h ---- linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cpia2/cpia2.h 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cpia2/cpia2.h ++++ linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2.h @@ -32,7 +32,7 @@ #define __CPIA2_H__ @@ -52994,9 +53379,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2.h linux-2.6.35.x __u32 pixelformat; /* Format fourcc */ /* USB */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2_v4l.c linux-2.6.35.x86_64.new/drivers/media/video/cpia2/cpia2_v4l.c ---- linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2_v4l.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cpia2/cpia2_v4l.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2_v4l.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cpia2/cpia2_v4l.c ++++ linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2_v4l.c @@ -37,7 +37,7 @@ #include #include @@ -53440,9 +53826,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cpia2/cpia2_v4l.c linux-2.6. }; /****************************************************************************** -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cpia2/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/cpia2/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/cpia2/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cpia2/Kconfig 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cpia2/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cpia2/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/cpia2/Kconfig @@ -1,6 +1,6 @@ config VIDEO_CPIA2 tristate "CPiA2 Video For Linux" @@ -53451,9 +53838,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cpia2/Kconfig linux-2.6.35.x ---help--- This is the video4linux driver for cameras based on Vision's CPiA2 (Colour Processor Interface ASIC), such as the Digital Blue QX5 -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cpia_usb.c linux-2.6.35.x86_64.new/drivers/media/video/cpia_usb.c ---- linux-2.6.35.x86_64/drivers/media/video/cpia_usb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cpia_usb.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cpia_usb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cpia_usb.c ++++ linux-2.6.35.x86_64/drivers/media/video/cpia_usb.c @@ -584,7 +584,6 @@ static void cpia_disconnect(struct usb_i { struct cam_data *cam = usb_get_intfdata(intf); @@ -53471,9 +53859,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cpia_usb.c linux-2.6.35.x86_ ucpia->curbuff = ucpia->workbuff = NULL; vfree(ucpia->buffers[2]); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cs5345.c linux-2.6.35.x86_64.new/drivers/media/video/cs5345.c ---- linux-2.6.35.x86_64/drivers/media/video/cs5345.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cs5345.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cs5345.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cs5345.c ++++ linux-2.6.35.x86_64/drivers/media/video/cs5345.c @@ -25,7 +25,6 @@ #include #include @@ -53513,9 +53902,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cs5345.c linux-2.6.35.x86_64 + +module_init(init_cs5345); +module_exit(exit_cs5345); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cs53l32a.c linux-2.6.35.x86_64.new/drivers/media/video/cs53l32a.c ---- linux-2.6.35.x86_64/drivers/media/video/cs53l32a.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cs53l32a.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cs53l32a.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cs53l32a.c ++++ linux-2.6.35.x86_64/drivers/media/video/cs53l32a.c @@ -26,11 +26,10 @@ #include #include @@ -53733,9 +54123,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cs53l32a.c linux-2.6.35.x86_ + +module_init(init_cs53l32a); +module_exit(exit_cs53l32a); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-cards.c linux-2.6.35.x86_64.new/drivers/media/video/cx18/cx18-cards.c ---- linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx18/cx18-cards.c 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx18/cx18-cards.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-cards.c @@ -39,7 +39,7 @@ static struct cx18_card_tuner_i2c cx18_i .tv = { 0x61, 0x60, I2C_CLIENT_END }, }; @@ -53820,9 +54211,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-cards.c linux-2.6. }; const struct cx18_card *cx18_get_card(u16 index) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-driver.c linux-2.6.35.x86_64.new/drivers/media/video/cx18/cx18-driver.c ---- linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-driver.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx18/cx18-driver.c 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-driver.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx18/cx18-driver.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-driver.c @@ -156,6 +156,7 @@ MODULE_PARM_DESC(cardtype, "\t\t\t 6 = Toshiba Qosmio DVB-T/Analog\n" "\t\t\t 7 = Leadtek WinFast PVR2100\n" @@ -53839,9 +54231,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-driver.c linux-2.6 tv->model = 0x718; cx18_eeprom_dump(cx, eedata, sizeof(eedata)); CX18_INFO("eeprom PCI ID: %02x%02x:%02x%02x\n", -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-driver.h linux-2.6.35.x86_64.new/drivers/media/video/cx18/cx18-driver.h ---- linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-driver.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx18/cx18-driver.h 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-driver.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx18/cx18-driver.h ++++ linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-driver.h @@ -84,7 +84,8 @@ #define CX18_CARD_TOSHIBA_QOSMIO_DVBT 5 /* Toshiba Qosmio Interal DVB-T/Analog*/ #define CX18_CARD_LEADTEK_PVR2100 6 /* Leadtek WinFast PVR2100 */ @@ -53892,9 +54285,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-driver.h linux-2.6 #define cx18_call_all_err(cx, o, f, args...) \ cx18_call_hw_err(cx, 0, o, f , ##args) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-dvb.c linux-2.6.35.x86_64.new/drivers/media/video/cx18/cx18-dvb.c ---- linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-dvb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx18/cx18-dvb.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-dvb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx18/cx18-dvb.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-dvb.c @@ -203,6 +203,14 @@ static struct zl10353_config yuan_mpc718 .disable_i2c_gate_ctrl = 1, /* Disable the I2C gate */ }; @@ -53948,9 +54342,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-dvb.c linux-2.6.35 default: /* No Digital Tv Support */ break; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-i2c.c linux-2.6.35.x86_64.new/drivers/media/video/cx18/cx18-i2c.c ---- linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx18/cx18-i2c.c 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx18/cx18-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-i2c.c @@ -71,19 +71,6 @@ static const u8 hw_bus[] = { }; @@ -54025,9 +54420,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-i2c.c linux-2.6.35 if (sd != NULL) sd->grp_id = hw; return sd != NULL ? 0 : -1; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-ioctl.c linux-2.6.35.x86_64.new/drivers/media/video/cx18/cx18-ioctl.c ---- linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-ioctl.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx18/cx18-ioctl.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-ioctl.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx18/cx18-ioctl.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-ioctl.c @@ -40,7 +40,6 @@ #include "cx18-av-core.h" #include @@ -54045,9 +54441,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/cx18-ioctl.c linux-2.6. struct cx18 *cx = id->cx; long res; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/cx18/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/cx18/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx18/Kconfig 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx18/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx18/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/cx18/Kconfig @@ -1,9 +1,8 @@ config VIDEO_CX18 tristate "Conexant cx23418 MPEG encoder support" @@ -54059,9 +54456,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx18/Kconfig linux-2.6.35.x8 select VIDEO_TUNER select VIDEO_TVEEPROM select VIDEO_CX2341X -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-417.c linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-417.c ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-417.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-417.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-417.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-417.c @@ -0,0 +1,2192 @@ +/* + * @@ -56255,9 +56653,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-417.c linux- + + return 0; +} -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-audio.c linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-audio.c ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-audio.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-audio.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-audio.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/cx231xx-audio.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-audio.c @@ -75,6 +75,30 @@ static int cx231xx_isoc_audio_deinit(str return 0; } @@ -56651,9 +57050,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-audio.c linu err = snd_card_register(card); if (err < 0) { snd_card_free(card); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-avcore.c linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-avcore.c ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-avcore.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-avcore.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-avcore.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/cx231xx-avcore.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-avcore.c @@ -31,13 +31,16 @@ #include #include @@ -57684,9 +58084,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-avcore.c lin { int status = 0; int i = 0; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-cards.c linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-cards.c ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-cards.c 2010-12-15 10:51:22.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-cards.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/cx231xx-cards.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-cards.c @@ -34,6 +34,7 @@ #include #include "dvb-usb-ids.h" @@ -58455,9 +58856,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-cards.c linu } } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-conf-reg.h linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-conf-reg.h ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-conf-reg.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-conf-reg.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-conf-reg.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/cx231xx-conf-reg.h ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-conf-reg.h @@ -39,6 +39,7 @@ #define CIR_CAR_REG 0x38 #define CIR_OT_CFG1 0x40 @@ -58466,9 +58868,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-conf-reg.h l #define PWR_CTL_EN 0x74 /* Polaris Endpoints capture mask for register EP_MODE_SET */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-core.c linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-core.c ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-core.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/cx231xx-core.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-core.c @@ -27,6 +27,7 @@ #include #include @@ -59573,9 +59976,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-core.c linux int cx231xx_read_i2c_data(struct cx231xx *dev, u8 dev_addr, u16 saddr, u8 saddr_len, u32 *data, u8 data_len) { -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-dif.h linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-dif.h ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-dif.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-dif.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-dif.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-dif.h @@ -0,0 +1,3178 @@ +/* + * cx231xx-dif.h - driver for Conexant Cx23100/101/102 USB video capture devices @@ -62755,9 +63159,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-dif.h linux- +}; + +#endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-dvb.c linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-dvb.c ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-dvb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-dvb.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-dvb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/cx231xx-dvb.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-dvb.c @@ -29,6 +29,11 @@ #include "xc5000.h" @@ -63159,9 +63564,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-dvb.c linux- } static int dvb_fini(struct cx231xx *dev) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx.h linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx.h ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx.h 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/cx231xx.h ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx.h @@ -27,16 +27,16 @@ #include #include @@ -63667,9 +64073,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx.h linux-2.6. /* printk macros */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-i2c.c linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-i2c.c ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-i2c.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/cx231xx-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-i2c.c @@ -359,7 +359,7 @@ static int cx231xx_i2c_xfer(struct i2c_a if (num <= 0) @@ -63719,9 +64126,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-i2c.c linux- } else cx231xx_warn("%s: i2c bus %d register FAILED\n", dev->name, bus->nr); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-input.c linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-input.c ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-input.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-input.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-input.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/cx231xx-input.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-input.c @@ -1,222 +1,101 @@ /* - handle cx231xx IR remotes via linux kernel input layer. @@ -64020,9 +64428,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-input.c linu - dev->ir = NULL; - return 0; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-vbi.c linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-vbi.c ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-vbi.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-vbi.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-vbi.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/cx231xx-vbi.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-vbi.c @@ -102,7 +102,7 @@ static inline int cx231xx_isoc_vbi_copy( return 0; } @@ -64318,9 +64727,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-vbi.c linux- + else + return 0; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-vbi.h linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-vbi.h ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-vbi.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-vbi.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-vbi.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/cx231xx-vbi.h ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-vbi.h @@ -41,7 +41,7 @@ extern struct videobuf_queue_ops cx231xx /* stream functions */ int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets, @@ -64330,9 +64740,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-vbi.h linux- struct urb *urb)); void cx231xx_uninit_vbi_isoc(struct cx231xx *dev); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-video.c linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-video.c ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-video.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/cx231xx-video.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/cx231xx-video.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-video.c @@ -237,7 +237,10 @@ static inline void buffer_filled(struct buf->vb.field_count++; do_gettimeofday(&buf->vb.ts); @@ -65441,9 +65852,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/cx231xx-video.c linu /* Audio defaults */ dev->mute = 1; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/Kconfig 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/Kconfig @@ -1,11 +1,12 @@ config VIDEO_CX231XX tristate "Conexant cx231xx USB video capture support" @@ -65488,9 +65900,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/Kconfig linux-2.6.35 ---help--- This adds support for DVB cards based on the -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/Makefile linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/Makefile ---- linux-2.6.35.x86_64/drivers/media/video/cx231xx/Makefile 2010-12-15 10:51:22.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx231xx/Makefile 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx231xx/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx231xx/Makefile ++++ linux-2.6.35.x86_64/drivers/media/video/cx231xx/Makefile @@ -1,5 +1,6 @@ -cx231xx-objs := cx231xx-video.o cx231xx-i2c.o cx231xx-cards.o cx231xx-core.o \ - cx231xx-avcore.o cx231xx-pcb-cfg.o cx231xx-vbi.o @@ -65500,9 +65913,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx231xx/Makefile linux-2.6.3 cx231xx-alsa-objs := cx231xx-audio.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx2341x.c linux-2.6.35.x86_64.new/drivers/media/video/cx2341x.c ---- linux-2.6.35.x86_64/drivers/media/video/cx2341x.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx2341x.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx2341x.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx2341x.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx2341x.c @@ -38,6 +38,145 @@ static int debug; module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "Debug level (0-1)"); @@ -66318,9 +66732,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx2341x.c linux-2.6.35.x86_6 + v4l2_ctrl_grab(cxhdl->video_bitrate_peak, busy); +} +EXPORT_SYMBOL(cx2341x_handler_set_busy); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-417.c linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-417.c ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-417.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-417.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-417.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/cx23885-417.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-417.c @@ -7,7 +7,7 @@ * (c) 2008 Steven Toth * - CX23885/7/8 support @@ -66363,9 +66778,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-417.c linux- return 0; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-av.c linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-av.c ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-av.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-av.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-av.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-av.c @@ -0,0 +1,35 @@ +/* + * Driver for the Conexant CX23885/7/8 PCIe bridge @@ -66402,9 +66818,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-av.c linux-2 + PCI_MSK_AV_CORE, &handled); + cx23885_irq_enable(dev, PCI_MSK_AV_CORE); +} -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-av.h linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-av.h ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-av.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-av.h 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-av.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-av.h @@ -0,0 +1,27 @@ +/* + * Driver for the Conexant CX23885/7/8 PCIe bridge @@ -66433,9 +66850,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-av.h linux-2 +#define _CX23885_AV_H_ +void cx23885_av_work_handler(struct work_struct *work); +#endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-cards.c linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-cards.c ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-cards.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/cx23885-cards.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-cards.c @@ -30,6 +30,16 @@ #include "netup-init.h" #include "cx23888-ir.h" @@ -66678,9 +67096,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-cards.c linu break; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-core.c ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-core.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/cx23885-core.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c @@ -34,6 +34,7 @@ #include "cimax2.h" #include "cx23888-ir.h" @@ -66782,7 +67201,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux cx_write(VID_A_INT_MSK, 0); cx_write(VID_B_INT_MSK, 0); cx_write(VID_C_INT_MSK, 0); -@@ -774,6 +853,8 @@ static int cx23885_dev_setup(struct cx23 +@@ -775,6 +853,8 @@ static int cx23885_dev_setup(struct cx23 { int i; @@ -66791,7 +67210,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux mutex_init(&dev->lock); mutex_init(&dev->gpio_lock); -@@ -820,9 +901,9 @@ static int cx23885_dev_setup(struct cx23 +@@ -821,9 +901,9 @@ static int cx23885_dev_setup(struct cx23 dev->pci_bus = dev->pci->bus->number; dev->pci_slot = PCI_SLOT(dev->pci->devfn); @@ -66803,7 +67222,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux /* External Master 1 Bus */ dev->i2c_bus[0].nr = 0; -@@ -1141,8 +1222,8 @@ void cx23885_free_buffer(struct videobuf +@@ -1142,8 +1222,8 @@ void cx23885_free_buffer(struct videobuf struct videobuf_dmabuf *dma = videobuf_to_dma(&buf->vb); BUG_ON(in_interrupt()); @@ -66814,7 +67233,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux videobuf_dma_free(dma); btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc); buf->vb.state = VIDEOBUF_NEEDS_INIT; -@@ -1156,7 +1237,7 @@ static void cx23885_tsport_reg_dump(stru +@@ -1157,7 +1237,7 @@ static void cx23885_tsport_reg_dump(stru dprintk(1, "%s() DEV_CNTRL2 0x%08X\n", __func__, cx_read(DEV_CNTRL2)); dprintk(1, "%s() PCI_INT_MSK 0x%08X\n", __func__, @@ -66823,7 +67242,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux dprintk(1, "%s() AUD_INT_INT_MSK 0x%08X\n", __func__, cx_read(AUDIO_INT_INT_MSK)); dprintk(1, "%s() AUD_INT_DMA_CTL 0x%08X\n", __func__, -@@ -1292,7 +1373,8 @@ static int cx23885_start_dma(struct cx23 +@@ -1293,7 +1373,8 @@ static int cx23885_start_dma(struct cx23 dprintk(1, "%s() enabling TS int's and DMA\n", __func__); cx_set(port->reg_ts_int_msk, port->ts_int_msk_val); cx_set(port->reg_dma_ctl, port->dma_ctl_val); @@ -66833,7 +67252,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux break; default: BUG(); -@@ -1650,10 +1732,10 @@ static irqreturn_t cx23885_irq(int irq, +@@ -1651,10 +1732,10 @@ static irqreturn_t cx23885_irq(int irq, u32 ts1_status, ts1_mask; u32 ts2_status, ts2_mask; int vida_count = 0, ts1_count = 0, ts2_count = 0, handled = 0; @@ -66846,7 +67265,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux vida_status = cx_read(VID_A_INT_STAT); vida_mask = cx_read(VID_A_INT_MSK); ts1_status = cx_read(VID_B_INT_STAT); -@@ -1681,7 +1763,7 @@ static irqreturn_t cx23885_irq(int irq, +@@ -1682,7 +1763,7 @@ static irqreturn_t cx23885_irq(int irq, PCI_MSK_VID_C | PCI_MSK_VID_B | PCI_MSK_VID_A | PCI_MSK_AUD_INT | PCI_MSK_AUD_EXT | PCI_MSK_GPIO0 | PCI_MSK_GPIO1 | @@ -66855,7 +67274,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux if (pci_status & PCI_MSK_RISC_RD) dprintk(7, " (PCI_MSK_RISC_RD 0x%08x)\n", -@@ -1731,6 +1813,10 @@ static irqreturn_t cx23885_irq(int irq, +@@ -1732,6 +1813,10 @@ static irqreturn_t cx23885_irq(int irq, dprintk(7, " (PCI_MSK_GPIO1 0x%08x)\n", PCI_MSK_GPIO1); @@ -66866,7 +67285,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux if (pci_status & PCI_MSK_IR) dprintk(7, " (PCI_MSK_IR 0x%08x)\n", PCI_MSK_IR); -@@ -1765,12 +1851,22 @@ static irqreturn_t cx23885_irq(int irq, +@@ -1766,12 +1851,22 @@ static irqreturn_t cx23885_irq(int irq, handled += cx23885_video_irq(dev, vida_status); if (pci_status & PCI_MSK_IR) { @@ -66892,7 +67311,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux if (handled) cx_write(PCI_INT_STAT, pci_status); out: -@@ -1788,11 +1884,11 @@ static void cx23885_v4l2_dev_notify(stru +@@ -1789,11 +1884,11 @@ static void cx23885_v4l2_dev_notify(stru dev = to_cx23885(sd->v4l2_dev); switch (notification) { @@ -66906,7 +67325,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux if (sd == dev->sd_ir) cx23885_ir_tx_v4l2_dev_notify(sd, *(u32 *)arg); break; -@@ -1801,6 +1897,7 @@ static void cx23885_v4l2_dev_notify(stru +@@ -1802,6 +1897,7 @@ static void cx23885_v4l2_dev_notify(stru static void cx23885_v4l2_dev_notify_init(struct cx23885_dev *dev) { @@ -66914,7 +67333,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux INIT_WORK(&dev->ir_rx_work, cx23885_ir_rx_work_handler); INIT_WORK(&dev->ir_tx_work, cx23885_ir_tx_work_handler); dev->v4l2_dev.notify = cx23885_v4l2_dev_notify; -@@ -1953,8 +2050,12 @@ static int __devinit cx23885_initdev(str +@@ -1954,8 +2050,12 @@ static int __devinit cx23885_initdev(str goto fail_irq; } @@ -66929,7 +67348,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux if (err < 0) { printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name, pci_dev->irq); -@@ -1963,7 +2064,7 @@ static int __devinit cx23885_initdev(str +@@ -1964,7 +2064,7 @@ static int __devinit cx23885_initdev(str switch (dev->board) { case CX23885_BOARD_NETUP_DUAL_DVBS2_CI: @@ -66938,7 +67357,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux break; } -@@ -2000,6 +2101,7 @@ static void __devexit cx23885_finidev(st +@@ -2001,6 +2101,7 @@ static void __devexit cx23885_finidev(st /* unregister stuff */ free_irq(pci_dev->irq, dev); @@ -66946,9 +67365,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-core.c linux cx23885_dev_unregister(dev); v4l2_device_unregister(v4l2_dev); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-dvb.c linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-dvb.c ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-dvb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-dvb.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-dvb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/cx23885-dvb.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-dvb.c @@ -991,7 +991,7 @@ static int dvb_register(struct cx23885_t ret = videobuf_dvb_register_bus(&port->frontends, THIS_MODULE, port, &dev->pci->dev, adapter_nr, 0, @@ -66979,9 +67399,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-dvb.c linux- } err = dvb_register(port); if (err != 0) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885.h linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885.h ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885.h 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/cx23885.h ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885.h @@ -30,6 +30,7 @@ #include #include @@ -67051,9 +67472,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885.h linux-2.6. /* ----------------------------------------------------------- */ /* cx23885-cards.c */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-i2c.c linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-i2c.c ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-i2c.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/cx23885-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-i2c.c @@ -99,7 +99,7 @@ static int i2c_sendbytes(struct i2c_adap if (!i2c_wait_done(i2c_adap)) return -EIO; @@ -67153,9 +67575,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-i2c.c linux- return bus->i2c_rc; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-input.c linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-input.c ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-input.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-input.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-input.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/cx23885-input.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-input.c @@ -35,163 +35,42 @@ * 02110-1301, USA. */ @@ -67634,9 +68057,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-input.c linu + kfree(dev->kernel_ir); + dev->kernel_ir = NULL; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-ir.c linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-ir.c ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-ir.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-ir.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-ir.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/cx23885-ir.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-ir.c @@ -53,7 +53,7 @@ void cx23885_ir_rx_work_handler(struct w if (events == 0) return; @@ -67691,9 +68115,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-ir.c linux-2 + else + schedule_work(&dev->ir_tx_work); } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-reg.h linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-reg.h ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-reg.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-reg.h 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-reg.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/cx23885-reg.h ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-reg.h @@ -213,6 +213,7 @@ Channel manager Data Structure entry = 2 #define DEV_CNTRL2 0x00040000 @@ -67702,9 +68127,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-reg.h linux- #define PCI_MSK_GPIO1 (1 << 24) #define PCI_MSK_GPIO0 (1 << 23) #define PCI_MSK_APB_DMA (1 << 12) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-vbi.c linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-vbi.c ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-vbi.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-vbi.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-vbi.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/cx23885-vbi.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-vbi.c @@ -74,7 +74,7 @@ static int cx23885_start_vbi_dma(struct q->count = 1; @@ -67714,9 +68140,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-vbi.c linux- cx_set(VID_A_INT_MSK, 0x000022); /* start dma */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-video.c linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-video.c ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-video.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23885-video.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/cx23885-video.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-video.c @@ -26,7 +26,6 @@ #include #include @@ -67832,9 +68259,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23885-video.c linu if (sd) { struct tuner_setup tun_setup; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23888-ir.c linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23888-ir.c ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23888-ir.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/cx23888-ir.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23888-ir.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/cx23888-ir.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23888-ir.c @@ -26,6 +26,7 @@ #include @@ -68165,9 +68593,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/cx23888-ir.c linux-2 }; int cx23888_ir_probe(struct cx23885_dev *dev) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/cx23885/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/Kconfig 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/Kconfig @@ -5,7 +5,7 @@ config VIDEO_CX23885 select VIDEO_BTCX select VIDEO_TUNER @@ -68177,9 +68606,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/Kconfig linux-2.6.35 select VIDEOBUF_DVB select VIDEOBUF_DMA_SG select VIDEO_CX25840 -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/Makefile linux-2.6.35.x86_64.new/drivers/media/video/cx23885/Makefile ---- linux-2.6.35.x86_64/drivers/media/video/cx23885/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx23885/Makefile 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx23885/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx23885/Makefile ++++ linux-2.6.35.x86_64/drivers/media/video/cx23885/Makefile @@ -1,7 +1,8 @@ cx23885-objs := cx23885-cards.o cx23885-video.o cx23885-vbi.o \ cx23885-core.o cx23885-i2c.o cx23885-dvb.o cx23885-417.o \ @@ -68191,9 +68621,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx23885/Makefile linux-2.6.3 obj-$(CONFIG_VIDEO_CX23885) += cx23885.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-audio.c linux-2.6.35.x86_64.new/drivers/media/video/cx25840/cx25840-audio.c ---- linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-audio.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx25840/cx25840-audio.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-audio.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx25840/cx25840-audio.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-audio.c @@ -437,70 +437,51 @@ void cx25840_audio_set_path(struct i2c_c { struct cx25840_state *state = to_state(i2c_get_clientdata(client)); @@ -68453,9 +68884,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-audio.c linu +const struct v4l2_ctrl_ops cx25840_audio_ctrl_ops = { + .s_ctrl = cx25840_audio_s_ctrl, +}; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-core.c linux-2.6.35.x86_64.new/drivers/media/video/cx25840/cx25840-core.c ---- linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx25840/cx25840-core.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx25840/cx25840-core.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-core.c @@ -15,6 +15,9 @@ * * CX23885 support by Steven Toth . @@ -69225,9 +69657,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-core.c linux + +module_init(init_cx25840); +module_exit(exit_cx25840); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-core.h linux-2.6.35.x86_64.new/drivers/media/video/cx25840/cx25840-core.h ---- linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-core.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx25840/cx25840-core.h 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-core.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx25840/cx25840-core.h ++++ linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-core.h @@ -24,19 +24,20 @@ #include #include @@ -69339,9 +69772,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-core.h linux +int cx25840_ir_remove(struct v4l2_subdev *sd); + #endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-ir.c linux-2.6.35.x86_64.new/drivers/media/video/cx25840/cx25840-ir.c ---- linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-ir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx25840/cx25840-ir.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-ir.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-ir.c @@ -0,0 +1,1280 @@ +/* + * Driver for the Conexant CX2584x Audio/Video decoder chip and related cores @@ -70623,9 +71057,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx25840/cx25840-ir.c linux-2 + state->ir_state = NULL; + return 0; +} -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx25840/Makefile linux-2.6.35.x86_64.new/drivers/media/video/cx25840/Makefile ---- linux-2.6.35.x86_64/drivers/media/video/cx25840/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx25840/Makefile 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx25840/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx25840/Makefile ++++ linux-2.6.35.x86_64/drivers/media/video/cx25840/Makefile @@ -1,5 +1,5 @@ cx25840-objs := cx25840-core.o cx25840-audio.o cx25840-firmware.o \ - cx25840-vbi.o @@ -70633,9 +71068,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx25840/Makefile linux-2.6.3 obj-$(CONFIG_VIDEO_CX25840) += cx25840.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-alsa.c linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-alsa.c ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-alsa.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-alsa.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-alsa.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88-alsa.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-alsa.c @@ -40,6 +40,7 @@ #include #include @@ -70975,9 +71411,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-alsa.c linux-2.6.3 strcpy (card->driver, "CX88x"); sprintf(card->shortname, "Conexant CX%x", pci->device); sprintf(card->longname, "%s at %#llx", -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-blackbird.c linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-blackbird.c ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-blackbird.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-blackbird.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-blackbird.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88-blackbird.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-blackbird.c @@ -9,7 +9,7 @@ * (c) 2005-2006 Mauro Carvalho Chehab * - video_ioctl2 conversion @@ -71053,9 +71490,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-blackbird.c linux- /* Make sure we release the hardware */ drv = cx8802_get_driver(dev, CX88_MPEG_BLACKBIRD); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-cards.c linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-cards.c ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-cards.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88-cards.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-cards.c @@ -45,6 +45,10 @@ static unsigned int latency = UNSET; module_param(latency,int,0444); MODULE_PARM_DESC(latency,"pci latency timer"); @@ -71189,9 +71627,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-cards.c linux-2.6. return core; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-core.c linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-core.c ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-core.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88-core.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-core.c @@ -217,8 +217,8 @@ cx88_free_buffer(struct videobuf_queue * struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); @@ -71313,9 +71752,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-core.c linux-2.6.3 vfd->v4l2_dev = &core->v4l2_dev; vfd->parent = &pci->dev; vfd->release = video_device_release; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-dsp.c linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-dsp.c ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-dsp.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-dsp.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-dsp.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88-dsp.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-dsp.c @@ -230,7 +230,7 @@ static s32 detect_btsc(struct cx88_core static s16 *read_rds_samples(struct cx88_core *core, u32 *N) @@ -71346,9 +71786,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-dsp.c linux-2.6.35 } kfree(samples); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-dvb.c linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-dvb.c ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-dvb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-dvb.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-dvb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88-dvb.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-dvb.c @@ -56,6 +56,7 @@ #include "stv0900.h" #include "stb6100.h" @@ -71788,9 +72229,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-dvb.c linux-2.6.35 /* init struct videobuf_dvb */ fe->dvb.name = dev->core->name; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88.h linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88.h ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88.h 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88.h ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88.h @@ -31,9 +31,8 @@ #include #include @@ -72006,9 +72448,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88.h linux-2.6.35.x86 - * End: - * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off - */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-i2c.c linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-i2c.c ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-i2c.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-i2c.c @@ -108,7 +108,7 @@ static const struct i2c_algo_bit_data cx /* ----------------------------------------------------------------------- */ @@ -72067,9 +72510,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-i2c.c linux-2.6.35 - * c-basic-offset: 8 - * End: - */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-input.c linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-input.c ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-input.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-input.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-input.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88-input.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-input.c @@ -24,13 +24,12 @@ #include @@ -72548,9 +72992,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-input.c linux-2.6. - * c-basic-offset: 8 - * End: - */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-mpeg.c linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-mpeg.c ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-mpeg.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-mpeg.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-mpeg.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88-mpeg.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-mpeg.c @@ -313,7 +313,7 @@ void cx8802_buf_queue(struct cx8802_dev /* ----------------------------------------------------------- */ @@ -72578,9 +73023,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-mpeg.c linux-2.6.3 { .vendor = 0x14f1, .device = 0x8802, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-tvaudio.c linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-tvaudio.c ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-tvaudio.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-tvaudio.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-tvaudio.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88-tvaudio.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-tvaudio.c @@ -70,7 +70,7 @@ MODULE_PARM_DESC(radio_deemphasis, "Radi /* ----------------------------------------------------------- */ @@ -72680,9 +73126,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-tvaudio.c linux-2. hw_autodetect: /* stereo autodetection is supported by hardware so we don't need to do it manually. Do nothing. */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-vbi.c linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-vbi.c ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-vbi.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-vbi.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-vbi.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88-vbi.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-vbi.c @@ -230,7 +230,7 @@ static void vbi_release(struct videobuf_ cx88_free_buffer(q,buf); } @@ -72692,9 +73139,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-vbi.c linux-2.6.35 .buf_setup = vbi_setup, .buf_prepare = vbi_prepare, .buf_queue = vbi_queue, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-video.c linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-video.c ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-video.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-video.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88-video.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-video.c @@ -41,6 +41,7 @@ #include "cx88.h" #include @@ -72986,9 +73434,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-video.c linux-2.6. { .vendor = 0x14f1, .device = 0x8800, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-vp3054-i2c.c linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-vp3054-i2c.c ---- linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-vp3054-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/cx88-vp3054-i2c.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-vp3054-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/cx88-vp3054-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-vp3054-i2c.c @@ -121,8 +121,6 @@ int vp3054_i2c_probe(struct cx8802_dev * memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template, sizeof(vp3054_i2c->algo)); @@ -72998,9 +73447,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/cx88-vp3054-i2c.c linux vp3054_i2c->adap.dev.parent = &dev->pci->dev; strlcpy(vp3054_i2c->adap.name, core->name, sizeof(vp3054_i2c->adap.name)); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/cx88/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/cx88/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/cx88/Kconfig 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/cx88/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/cx88/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/cx88/Kconfig @@ -1,12 +1,11 @@ config VIDEO_CX88 tristate "Conexant 2388x (bt878 successor) support" @@ -73024,9 +73474,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/cx88/Kconfig linux-2.6.35.x8 select SND_PCM ---help--- This is a video4linux driver for direct (DMA) audio on -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/dabusb.c linux-2.6.35.x86_64.new/drivers/media/video/dabusb.c ---- linux-2.6.35.x86_64/drivers/media/video/dabusb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/dabusb.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/dabusb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/dabusb.c ++++ linux-2.6.35.x86_64/drivers/media/video/dabusb.c @@ -32,7 +32,6 @@ #include #include @@ -73122,9 +73573,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/dabusb.c linux-2.6.35.x86_64 return ret; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/davinci/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/davinci/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/davinci/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/davinci/Kconfig 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/davinci/Kconfig +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/davinci/Kconfig @@ -0,0 +1,93 @@ +config DISPLAY_DAVINCI_DM646X_EVM + tristate "DM646x EVM Video Display" @@ -73219,9 +73671,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/davinci/Kconfig linux-2.6.35 + + To compile this driver as a module, choose M here: the + module will be called vpfe. -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/davinci/vpfe_capture.c linux-2.6.35.x86_64.new/drivers/media/video/davinci/vpfe_capture.c ---- linux-2.6.35.x86_64/drivers/media/video/davinci/vpfe_capture.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/davinci/vpfe_capture.c 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/davinci/vpfe_capture.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/davinci/vpfe_capture.c ++++ linux-2.6.35.x86_64/drivers/media/video/davinci/vpfe_capture.c @@ -370,7 +370,7 @@ static int vpfe_config_ccdc_image_format * For a given standard, this functions sets up the default * pix format & crop values in the vpfe device and ccdc. It first @@ -73326,9 +73779,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/davinci/vpfe_capture.c linux &sdinfo->board_info, NULL); if (vpfe_dev->sd[i]) { -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/davinci/vpif_capture.c linux-2.6.35.x86_64.new/drivers/media/video/davinci/vpif_capture.c ---- linux-2.6.35.x86_64/drivers/media/video/davinci/vpif_capture.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/davinci/vpif_capture.c 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/davinci/vpif_capture.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/davinci/vpif_capture.c ++++ linux-2.6.35.x86_64/drivers/media/video/davinci/vpif_capture.c @@ -731,7 +731,6 @@ static int vpif_mmap(struct file *filep, */ static unsigned int vpif_poll(struct file *filep, poll_table * wait) @@ -73404,9 +73858,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/davinci/vpif_capture.c linux .driver = { .name = "vpif_capture", .owner = THIS_MODULE, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/davinci/vpif_display.c linux-2.6.35.x86_64.new/drivers/media/video/davinci/vpif_display.c ---- linux-2.6.35.x86_64/drivers/media/video/davinci/vpif_display.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/davinci/vpif_display.c 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/davinci/vpif_display.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/davinci/vpif_display.c ++++ linux-2.6.35.x86_64/drivers/media/video/davinci/vpif_display.c @@ -600,7 +600,7 @@ static int vpif_open(struct file *filep) ch = video_get_drvdata(vdev); @@ -73474,9 +73929,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/davinci/vpif_display.c linux .driver = { .name = "vpif_display", .owner = THIS_MODULE, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-audio.c linux-2.6.35.x86_64.new/drivers/media/video/em28xx/em28xx-audio.c ---- linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-audio.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/em28xx/em28xx-audio.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-audio.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/em28xx/em28xx-audio.c ++++ linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-audio.c @@ -102,6 +102,9 @@ static void em28xx_audio_isocirq(struct break; } @@ -73632,9 +74088,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-audio.c linux- err = snd_card_register(card); if (err < 0) { snd_card_free(card); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-cards.c linux-2.6.35.x86_64.new/drivers/media/video/em28xx/em28xx-cards.c ---- linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/em28xx/em28xx-cards.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/em28xx/em28xx-cards.c ++++ linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-cards.c @@ -158,6 +158,22 @@ static struct em28xx_reg_seq evga_indtub { -1, -1, -1, -1}, }; @@ -73969,9 +74426,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-cards.c linux- if (retval < 0) { em28xx_errdev("%s: em28xx_write_regs_req failed!" " retval [%d]\n", -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-dvb.c linux-2.6.35.x86_64.new/drivers/media/video/em28xx/em28xx-dvb.c ---- linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-dvb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/em28xx/em28xx-dvb.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-dvb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/em28xx/em28xx-dvb.c ++++ linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-dvb.c @@ -30,11 +30,14 @@ #include "tuner-simple.h" @@ -74068,9 +74526,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-dvb.c linux-2. default: em28xx_errdev("/2: The frontend of your DVB/ATSC card" " isn't supported yet\n"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx.h linux-2.6.35.x86_64.new/drivers/media/video/em28xx/em28xx.h ---- linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/em28xx/em28xx.h 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/em28xx/em28xx.h ++++ linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx.h @@ -25,13 +25,15 @@ #ifndef _EM28XX_H #define _EM28XX_H @@ -74139,9 +74598,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx.h linux-2.6.35 struct em28xx_fmt *format; struct em28xx_IR *ir; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-input.c linux-2.6.35.x86_64.new/drivers/media/video/em28xx/em28xx-input.c ---- linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-input.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/em28xx/em28xx-input.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-input.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/em28xx/em28xx-input.c ++++ linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-input.c @@ -25,7 +25,6 @@ #include #include @@ -74419,9 +74879,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-input.c linux- kfree(ir); /* done */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-video.c linux-2.6.35.x86_64.new/drivers/media/video/em28xx/em28xx-video.c ---- linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-video.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/em28xx/em28xx-video.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/em28xx/em28xx-video.c ++++ linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-video.c @@ -277,12 +277,13 @@ static void em28xx_copy_vbi(struct em28x { void *startwrite, *startread; @@ -74838,9 +75299,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/em28xx-video.c linux- dev->interlaced = EM28XX_INTERLACED_DEFAULT; dev->ctl_input = 0; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/em28xx/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/em28xx/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/em28xx/Kconfig 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/em28xx/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/em28xx/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/em28xx/Kconfig @@ -1,9 +1,9 @@ config VIDEO_EM28XX tristate "Empia EM28xx USB video capture support" @@ -74861,9 +75323,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/em28xx/Kconfig linux-2.6.35. select VIDEOBUF_DVB ---help--- This adds support for DVB cards based on the -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/fsl-viu.c linux-2.6.35.x86_64.new/drivers/media/video/fsl-viu.c ---- linux-2.6.35.x86_64/drivers/media/video/fsl-viu.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/fsl-viu.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/fsl-viu.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/fsl-viu.c @@ -0,0 +1,1633 @@ +/* + * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved. @@ -76498,9 +76961,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/fsl-viu.c linux-2.6.35.x86_6 +MODULE_DESCRIPTION("Freescale Video-In(VIU)"); +MODULE_AUTHOR("Hongjun Chen"); +MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/benq.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/benq.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/benq.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/benq.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/benq.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/benq.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/benq.c @@ -62,7 +62,7 @@ static void reg_w(struct gspca_dev *gspc 0, 500); @@ -76572,9 +77036,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/benq.c linux-2.6.35.x8 } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/conex.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/conex.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/conex.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/conex.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/conex.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/conex.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/conex.c @@ -41,7 +41,7 @@ struct sd { #define QUALITY_MAX 60 #define QUALITY_DEF 40 @@ -76652,9 +77117,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/conex.c linux-2.6.35.x } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/cpia1.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/cpia1.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/cpia1.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/cpia1.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/cpia1.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/cpia1.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/cpia1.c @@ -1,7 +1,7 @@ /* * cpia CPiA (1) gspca driver @@ -76970,9 +77436,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/cpia1.c linux-2.6.35.x } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/etoms.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/etoms.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/etoms.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/etoms.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/etoms.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/etoms.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/etoms.c @@ -710,9 +710,9 @@ static void Et_setgainG(struct gspca_dev } @@ -77005,9 +77472,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/etoms.c linux-2.6.35.x } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/finepix.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/finepix.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/finepix.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/finepix.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/finepix.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/finepix.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/finepix.c @@ -182,7 +182,7 @@ static int sd_start(struct gspca_dev *gs /* Init the device */ ret = command(gspca_dev, 0); @@ -77055,9 +77523,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/finepix.c linux-2.6.35 } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/gl860/gl860.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/gl860/gl860.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/gl860/gl860.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860.c @@ -63,7 +63,7 @@ static int sd_set_##thename(struct gspca \ sd->vcur.thename = val;\ @@ -77196,9 +77665,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860.c linux-2. } else if (_OV9655_) { PDEBUG(D_PROBE, "05e3:0503 sensor OV9655 (1.3M)"); } else if (_OV2640_) { -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860.h linux-2.6.35.x86_64.new/drivers/media/video/gspca/gl860/gl860.h ---- linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/gl860/gl860.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/gl860/gl860.h ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860.h @@ -32,19 +32,16 @@ #define ID_OV2640 2 #define ID_OV9655 4 @@ -77235,9 +77705,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860.h linux-2. u8 waitSet; }; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860-mi2020.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/gl860/gl860-mi2020.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860-mi2020.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/gl860/gl860-mi2020.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860-mi2020.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/gl860/gl860-mi2020.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860-mi2020.c @@ -1,6 +1,7 @@ /* Subdriver for the GL860 chip with the MI2020 sensor - * Author Olivier LORIN, from Ice/Soro2005's logs(A), Fret_saw/Hulkie's @@ -78229,9 +78700,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860-mi2020.c l + msleep(40); + ctrl_out(gspca_dev, 0x40, 1, 0x0001, 0x0000, 0, NULL); } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860-ov9655.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/gl860/gl860-ov9655.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860-ov9655.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/gl860/gl860-ov9655.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860-ov9655.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/gl860/gl860-ov9655.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860-ov9655.c @@ -69,7 +69,7 @@ static u8 *tbl_640[] = { "\xd0\x01\xd1\x08\xd2\xe0\xd3\x01" "\xd4\x10\xd5\x80" }; @@ -78250,9 +78722,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/gl860/gl860-ov9655.c l ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200, tbl_length[0], tbl[0]); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/gspca.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/gspca.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/gspca.c 2010-12-15 10:51:22.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/gspca.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/gspca.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/gspca.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/gspca.c @@ -55,7 +55,7 @@ MODULE_AUTHOR("Jean-François Moine #include @@ -79315,9 +79789,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/gspca.h linux-2.6.35.x #ifdef CONFIG_PM int gspca_suspend(struct usb_interface *intf, pm_message_t message); int gspca_resume(struct usb_interface *intf); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/jeilinj.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/jeilinj.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/jeilinj.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/jeilinj.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/jeilinj.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/jeilinj.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/jeilinj.c @@ -50,7 +50,7 @@ struct sd { struct workqueue_struct *work_thread; u8 quality; /* image quality */ @@ -79393,9 +79868,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/jeilinj.c linux-2.6.35 } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/gspca/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/gspca/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/Kconfig 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/Kconfig @@ -77,6 +77,15 @@ config USB_GSPCA_JEILINJ To compile this driver as a module, choose M here: the module will be called gspca_jeilinj. @@ -79460,9 +79936,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/Kconfig linux-2.6.35.x config USB_GSPCA_ZC3XX tristate "ZC3XX USB Camera Driver" depends on VIDEO_V4L2 && USB_GSPCA -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/konica.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/konica.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/konica.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/konica.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/konica.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/konica.c @@ -0,0 +1,646 @@ +/* + * Driver for USB webcams based on Konica chipset. This @@ -80110,9 +80587,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/konica.c linux-2.6.35. + +module_init(sd_mod_init); +module_exit(sd_mod_exit); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_bridge.h linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_bridge.h ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_bridge.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_bridge.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_bridge.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_bridge.h ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_bridge.h @@ -19,6 +19,7 @@ #ifndef M5602_BRIDGE_H_ #define M5602_BRIDGE_H_ @@ -80121,9 +80599,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_bridge.h l #include "gspca.h" #define MODULE_NAME "ALi m5602" -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_core.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_core.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_core.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_core.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_core.c @@ -305,30 +305,23 @@ static void m5602_urb_complete(struct gs sd->frame_count); @@ -80179,9 +80658,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_core.c lin } module_init(mod_m5602_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_mt9m111.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_mt9m111.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_mt9m111.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_mt9m111.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_mt9m111.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_mt9m111.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_mt9m111.c @@ -109,14 +109,14 @@ static const struct ctrl mt9m111_ctrls[] #define GREEN_BALANCE_IDX 4 { @@ -80251,9 +80731,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_mt9m111.c }, .set = mt9m111_set_red_balance, .get = mt9m111_get_red_balance -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_mt9m111.h linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_mt9m111.h ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_mt9m111.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_mt9m111.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_mt9m111.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_mt9m111.h ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_mt9m111.h @@ -70,7 +70,7 @@ #define MT9M111_COLORPIPE 0x01 #define MT9M111_CAMERA_CONTROL 0x02 @@ -80308,9 +80789,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_mt9m111.h }; - #endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov7660.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_ov7660.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov7660.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_ov7660.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov7660.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_ov7660.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov7660.c @@ -54,13 +54,13 @@ static const struct ctrl ov7660_ctrls[] #define AUTO_WHITE_BALANCE_IDX 4 { @@ -80416,9 +80898,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov7660.c l }, .set = ov7660_set_vflip, .get = ov7660_get_vflip -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov7660.h linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_ov7660.h ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov7660.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_ov7660.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov7660.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_ov7660.h ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov7660.h @@ -80,7 +80,7 @@ #define OV7660_DEFAULT_GAIN 0x0e @@ -80454,9 +80937,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov7660.h l }; - #endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov9650.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_ov9650.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov9650.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_ov9650.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov9650.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_ov9650.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov9650.c @@ -121,8 +121,8 @@ static const struct ctrl ov9650_ctrls[] .minimum = 0x00, .maximum = 0x1ff, @@ -80624,9 +81108,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov9650.c l err = m5602_write_sensor(sd, OV9650_VREF, &i2c_data, 1); if (err < 0) return err; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov9650.h linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_ov9650.h ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov9650.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_ov9650.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov9650.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_ov9650.h ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov9650.h @@ -110,7 +110,7 @@ #define OV9650_VARIOPIXEL (1 << 2) @@ -80672,9 +81157,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_ov9650.h l }; - #endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_po1030.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_po1030.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_po1030.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_po1030.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_po1030.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_po1030.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_po1030.c @@ -58,14 +58,14 @@ static const struct ctrl po1030_ctrls[] #define GAIN_IDX 0 { @@ -80874,9 +81360,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_po1030.c l }, .set = po1030_set_green_balance, .get = po1030_get_green_balance -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_po1030.h linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_po1030.h ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_po1030.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_po1030.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_po1030.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_po1030.h ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_po1030.h @@ -139,9 +139,9 @@ #define PO1030_GLOBAL_GAIN_DEFAULT 0x12 @@ -80916,9 +81403,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_po1030.h l }; - #endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k4aa.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_s5k4aa.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k4aa.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_s5k4aa.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k4aa.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_s5k4aa.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k4aa.c @@ -143,13 +143,13 @@ static const struct ctrl s5k4aa_ctrls[] #define VFLIP_IDX 0 { @@ -80961,9 +81449,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k4aa.c l }, .set = s5k4aa_set_hflip, .get = s5k4aa_get_hflip -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k4aa.h linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_s5k4aa.h ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k4aa.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_s5k4aa.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k4aa.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_s5k4aa.h ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k4aa.h @@ -83,8 +83,7 @@ static const struct m5602_sensor s5k4aa .disconnect = s5k4aa_disconnect, }; @@ -81011,9 +81500,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k4aa.h l - - #endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k83a.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_s5k83a.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k83a.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_s5k83a.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k83a.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_s5k83a.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k83a.c @@ -17,7 +17,6 @@ */ @@ -81022,9 +81512,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k83a.c l #include "m5602_s5k83a.h" static int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k83a.h linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_s5k83a.h ---- linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k83a.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/m5602/m5602_s5k83a.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k83a.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/m5602/m5602_s5k83a.h ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k83a.h @@ -35,7 +35,7 @@ #define S5K83A_MAXIMUM_EXPOSURE 0x3c #define S5K83A_FLIP_MASK 0x10 @@ -81070,9 +81561,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/m5602/m5602_s5k83a.h l }; - #endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/Makefile linux-2.6.35.x86_64.new/drivers/media/video/gspca/Makefile ---- linux-2.6.35.x86_64/drivers/media/video/gspca/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/Makefile 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/Makefile ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_USB_GSPCA_CPIA1) += gspc obj-$(CONFIG_USB_GSPCA_ETOMS) += gspca_etoms.o obj-$(CONFIG_USB_GSPCA_FINEPIX) += gspca_finepix.o @@ -81125,9 +81617,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/Makefile linux-2.6.35. gspca_zc3xx-objs := zc3xx.o obj-$(CONFIG_USB_M5602) += m5602/ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/mars.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/mars.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/mars.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/mars.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/mars.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/mars.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/mars.c @@ -28,34 +28,41 @@ MODULE_AUTHOR("Michel Xhaard * @@ -81862,9 +82356,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/mr97310a.c linux-2.6.3 } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/ov519.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/ov519.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/ov519.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/ov519.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/ov519.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/ov519.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/ov519.c @@ -41,6 +41,11 @@ #include #include "gspca.h" @@ -85407,9 +85902,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/ov519.c linux-2.6.35.x } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/ov534_9.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/ov534_9.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/ov534_9.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/ov534_9.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/ov534_9.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/ov534_9.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/ov534_9.c @@ -785,7 +785,7 @@ static void reg_w_i(struct gspca_dev *gs USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, 0x00, reg, gspca_dev->usb_buf, 1, CTRL_TIMEOUT); @@ -85472,9 +85968,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/ov534_9.c linux-2.6.35 } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/ov534.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/ov534.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/ov534.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/ov534.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/ov534.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/ov534.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/ov534.c @@ -487,7 +487,7 @@ static void ov534_reg_write(struct gspca USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, 0x00, reg, gspca_dev->usb_buf, 1, CTRL_TIMEOUT); @@ -85552,9 +86049,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/ov534.c linux-2.6.35.x } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/pac207.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/pac207.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/pac207.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/pac207.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/pac207.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/pac207.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/pac207.c @@ -1,7 +1,7 @@ /* * Pixart PAC207BCA library @@ -85666,9 +86164,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/pac207.c linux-2.6.35. } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/pac7302.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/pac7302.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/pac7302.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/pac7302.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/pac7302.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/pac7302.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/pac7302.c @@ -402,15 +402,14 @@ static void reg_w_buf(struct gspca_dev * memcpy(gspca_dev->usb_buf, buffer, len); ret = usb_control_msg(gspca_dev->dev, @@ -85834,9 +86333,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/pac7302.c linux-2.6.35 } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/pac7311.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/pac7311.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/pac7311.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/pac7311.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/pac7311.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/pac7311.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/pac7311.c @@ -270,15 +270,14 @@ static void reg_w_buf(struct gspca_dev * memcpy(gspca_dev->usb_buf, buffer, len); ret = usb_control_msg(gspca_dev->dev, @@ -85993,9 +86493,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/pac7311.c linux-2.6.35 } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sn9c2028.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/sn9c2028.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/sn9c2028.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/sn9c2028.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/sn9c2028.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/sn9c2028.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/sn9c2028.c @@ -75,7 +75,7 @@ static int sn9c2028_command(struct gspca USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE, 2, 0, gspca_dev->usb_buf, 6, 500); @@ -86062,9 +86563,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sn9c2028.c linux-2.6.3 } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sn9c20x.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/sn9c20x.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/sn9c20x.c 2010-12-15 10:51:22.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/sn9c20x.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/sn9c20x.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/sn9c20x.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/sn9c20x.c @@ -18,10 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -86512,9 +87014,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sn9c20x.c linux-2.6.35 } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sonixb.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/sonixb.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/sonixb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/sonixb.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/sonixb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/sonixb.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/sonixb.c @@ -323,10 +323,9 @@ static const __u8 initOv6650[] = { 0x00, 0x01, 0x01, 0x0a, 0x16, 0x12, 0x68, 0x8b, 0x10, 0x1d, 0x10, 0x02, 0x02, 0x09, 0x07 @@ -86619,9 +87122,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sonixb.c linux-2.6.35. } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sonixj.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/sonixj.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/sonixj.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/sonixj.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/sonixj.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/sonixj.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/sonixj.c @@ -22,7 +22,6 @@ #define MODULE_NAME "sonixj" @@ -86630,7 +87134,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sonixj.c linux-2.6.35. #include "gspca.h" #include "jpeg.h" -@@ -32,24 +31,32 @@ MODULE_AUTHOR("Jean-Fran�ois Moine usb_buf, 1, SQ905_CMD_TIMEOUT); @@ -89416,9 +89927,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sq905.c linux-2.6.35.x } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sq905c.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/sq905c.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/sq905c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/sq905c.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/sq905c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/sq905c.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/sq905c.c @@ -95,7 +95,7 @@ static int sq905c_command(struct gspca_d command, index, NULL, 0, SQ905C_CMD_TIMEOUT); @@ -89467,9 +89979,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sq905c.c linux-2.6.35. } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sq930x.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/sq930x.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/sq930x.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/sq930x.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/sq930x.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/sq930x.c @@ -0,0 +1,1196 @@ +/* + * SQ930x subdriver @@ -90667,9 +91180,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sq930x.c linux-2.6.35. + +module_init(sd_mod_init); +module_exit(sd_mod_exit); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/stk014.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/stk014.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/stk014.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/stk014.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/stk014.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/stk014.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/stk014.c @@ -27,34 +27,37 @@ MODULE_AUTHOR("Jean-Francois Moine cam_mode[sd->gspca_dev.curr_mode].priv) err = stv06xx_write_bridge(sd, 0x1505, 0x0f); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_st6422.h linux-2.6.35.x86_64.new/drivers/media/video/gspca/stv06xx/stv06xx_st6422.h ---- linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_st6422.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/stv06xx/stv06xx_st6422.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_st6422.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/stv06xx/stv06xx_st6422.h ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_st6422.h @@ -49,6 +49,9 @@ static int st6422_set_exposure(struct gs const struct stv06xx_sensor stv06xx_sensor_st6422 = { @@ -91473,9 +91997,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_st6422 .init = st6422_init, .probe = st6422_probe, .start = st6422_start, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c @@ -66,7 +66,7 @@ static const struct ctrl vv6410_ctrl[] = .minimum = 0, .maximum = 1, @@ -91485,9 +92010,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_vv6410 }, .set = vv6410_set_vflip, .get = vv6410_get_vflip -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h linux-2.6.35.x86_64.new/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h ---- linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h @@ -157,8 +157,8 @@ /* Audio Amplifier Setup Register */ #define VV6410_AT1 0x79 @@ -91529,9 +92055,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/stv06xx/stv06xx_vv6410 }; static const u8 vv6410_sensor_init[][2] = { -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sunplus.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/sunplus.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/sunplus.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/sunplus.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/sunplus.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/sunplus.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/sunplus.c @@ -54,7 +54,7 @@ struct sd { #define MegapixV4 4 #define MegaImageVI 5 @@ -91685,9 +92212,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/sunplus.c linux-2.6.35 } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/t613.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/t613.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/t613.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/t613.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/t613.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/t613.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/t613.c @@ -1,5 +1,7 @@ /* - * V4L2 by Jean-Francois Moine @@ -92500,9 +93028,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/t613.c linux-2.6.35.x8 } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/tv8532.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/tv8532.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/tv8532.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/tv8532.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/tv8532.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/tv8532.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/tv8532.c @@ -30,29 +30,46 @@ MODULE_LICENSE("GPL"); struct sd { struct gspca_dev gspca_dev; /* !! must be the first item */ @@ -92871,9 +93400,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/tv8532.c linux-2.6.35. } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/vc032x.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/vc032x.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/vc032x.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/vc032x.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/vc032x.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/vc032x.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/vc032x.c @@ -39,6 +39,10 @@ struct sd { u8 vflip; u8 lightfreq; @@ -93851,9 +94381,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/vc032x.c linux-2.6.35. } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/w996Xcf.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/w996Xcf.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/w996Xcf.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/w996Xcf.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/w996Xcf.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/w996Xcf.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/w996Xcf.c @@ -31,14 +31,10 @@ the sensor drivers to v4l2 sub drivers, and properly split of this driver from ov519.c */ @@ -94452,9 +94983,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/w996Xcf.c linux-2.6.35 } /* The w9968cf docs say that a 0 sized packet means EOF (and also SOF -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/xirlink_cit.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/xirlink_cit.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/xirlink_cit.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/xirlink_cit.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/xirlink_cit.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/xirlink_cit.c @@ -0,0 +1,3337 @@ +/* + * USB IBM C-It Video Camera driver @@ -97793,9 +98325,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/xirlink_cit.c linux-2. + +module_init(sd_mod_init); +module_exit(sd_mod_exit); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/zc3xx.c linux-2.6.35.x86_64.new/drivers/media/video/gspca/zc3xx.c ---- linux-2.6.35.x86_64/drivers/media/video/gspca/zc3xx.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/gspca/zc3xx.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/gspca/zc3xx.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/gspca/zc3xx.c ++++ linux-2.6.35.x86_64/drivers/media/video/gspca/zc3xx.c @@ -22,7 +22,6 @@ #define MODULE_NAME "zc3xx" @@ -100947,9 +101480,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/gspca/zc3xx.c linux-2.6.35.x } module_init(sd_mod_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-control.c linux-2.6.35.x86_64.new/drivers/media/video/hdpvr/hdpvr-control.c ---- linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-control.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/hdpvr/hdpvr-control.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-control.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/hdpvr/hdpvr-control.c ++++ linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-control.c @@ -29,8 +29,6 @@ int hdpvr_config_call(struct hdpvr_devic int ret; char request_type = 0x38, snd_request = 0x01; @@ -100969,9 +101503,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-control.c linux- error: return ret; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-core.c linux-2.6.35.x86_64.new/drivers/media/video/hdpvr/hdpvr-core.c ---- linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-core.c 2010-12-15 10:51:23.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/hdpvr/hdpvr-core.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/hdpvr/hdpvr-core.c ++++ linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-core.c @@ -60,6 +60,7 @@ static struct usb_device_id hdpvr_table[ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID1) }, { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID2) }, @@ -101069,9 +101604,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-core.c linux-2.6 /* this frees allocated memory */ hdpvr_delete(dev); } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr.h linux-2.6.35.x86_64.new/drivers/media/video/hdpvr/hdpvr.h ---- linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr.h 2010-12-15 10:51:23.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/hdpvr/hdpvr.h 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/hdpvr/hdpvr.h ++++ linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr.h @@ -30,14 +30,17 @@ #define HD_PVR_PRODUCT_ID 0x4900 #define HD_PVR_PRODUCT_ID1 0x4901 @@ -101101,9 +101637,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr.h linux-2.6.35.x /* I2C lock */ struct mutex i2c_mutex; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-i2c.c linux-2.6.35.x86_64.new/drivers/media/video/hdpvr/hdpvr-i2c.c ---- linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-i2c.c 2010-12-15 10:51:23.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/hdpvr/hdpvr-i2c.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/hdpvr/hdpvr-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-i2c.c @@ -10,8 +10,6 @@ * */ @@ -101255,9 +101792,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-i2c.c linux-2.6. } - -#endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-video.c linux-2.6.35.x86_64.new/drivers/media/video/hdpvr/hdpvr-video.c ---- linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-video.c 2010-12-15 10:51:23.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/hdpvr/hdpvr-video.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/hdpvr/hdpvr-video.c ++++ linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-video.c @@ -26,7 +26,7 @@ #include #include "hdpvr.h" @@ -101267,7 +101805,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-video.c linux-2. #define print_buffer_status() { \ v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev, \ -@@ -337,8 +338,6 @@ static int hdpvr_stop_streaming(struct h +@@ -338,8 +338,6 @@ static int hdpvr_stop_streaming(struct h dev->bulk_in_endpointAddr), buf, dev->bulk_in_size, &actual_length, BULK_URB_TIMEOUT)) { @@ -101276,7 +101814,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-video.c linux-2. v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev, "%2d: got %d bytes\n", c, actual_length); } -@@ -394,7 +393,7 @@ err: +@@ -395,7 +393,7 @@ err: static int hdpvr_release(struct file *file) { @@ -101285,7 +101823,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-video.c linux-2. struct hdpvr_device *dev = fh->dev; if (!dev) -@@ -518,7 +517,7 @@ err: +@@ -519,7 +517,7 @@ err: static unsigned int hdpvr_poll(struct file *filp, poll_table *wait) { struct hdpvr_buffer *buf = NULL; @@ -101294,7 +101832,7 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-video.c linux-2. struct hdpvr_device *dev = fh->dev; unsigned int mask = 0; -@@ -1221,9 +1220,12 @@ static void hdpvr_device_release(struct +@@ -1222,9 +1220,12 @@ static void hdpvr_device_release(struct v4l2_device_unregister(&dev->v4l2_dev); /* deregister I2C adapter */ @@ -101309,9 +101847,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/hdpvr-video.c linux-2. mutex_unlock(&dev->i2c_mutex); #endif /* CONFIG_I2C */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/Makefile linux-2.6.35.x86_64.new/drivers/media/video/hdpvr/Makefile ---- linux-2.6.35.x86_64/drivers/media/video/hdpvr/Makefile 2010-12-15 10:51:23.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/hdpvr/Makefile 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/hdpvr/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/hdpvr/Makefile ++++ linux-2.6.35.x86_64/drivers/media/video/hdpvr/Makefile @@ -1,4 +1,6 @@ -hdpvr-objs := hdpvr-control.o hdpvr-core.o hdpvr-video.o hdpvr-i2c.o +hdpvr-objs := hdpvr-control.o hdpvr-core.o hdpvr-video.o @@ -101320,9 +101859,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hdpvr/Makefile linux-2.6.35. obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hexium_gemini.c linux-2.6.35.x86_64.new/drivers/media/video/hexium_gemini.c ---- linux-2.6.35.x86_64/drivers/media/video/hexium_gemini.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/hexium_gemini.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/hexium_gemini.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/hexium_gemini.c ++++ linux-2.6.35.x86_64/drivers/media/video/hexium_gemini.c @@ -367,7 +367,6 @@ static int hexium_attach(struct saa7146_ saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26)); @@ -101331,9 +101871,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hexium_gemini.c linux-2.6.35 .name = "hexium gemini", }; saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hexium_orion.c linux-2.6.35.x86_64.new/drivers/media/video/hexium_orion.c ---- linux-2.6.35.x86_64/drivers/media/video/hexium_orion.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/hexium_orion.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/hexium_orion.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/hexium_orion.c ++++ linux-2.6.35.x86_64/drivers/media/video/hexium_orion.c @@ -230,7 +230,6 @@ static int hexium_probe(struct saa7146_d saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26)); @@ -101342,9 +101883,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/hexium_orion.c linux-2.6.35. .name = "hexium orion", }; saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/imx074.c linux-2.6.35.x86_64.new/drivers/media/video/imx074.c ---- linux-2.6.35.x86_64/drivers/media/video/imx074.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/imx074.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/imx074.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/imx074.c @@ -0,0 +1,505 @@ +/* + * Driver for IMX074 CMOS Image Sensor from Sony @@ -101851,9 +102393,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/imx074.c linux-2.6.35.x86_64 +MODULE_DESCRIPTION("Sony IMX074 Camera driver"); +MODULE_AUTHOR("Guennadi Liakhovetski "); +MODULE_LICENSE("GPL v2"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/indycam.c linux-2.6.35.x86_64.new/drivers/media/video/indycam.c ---- linux-2.6.35.x86_64/drivers/media/video/indycam.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/indycam.c 2010-12-15 11:13:19.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/indycam.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/indycam.c ++++ linux-2.6.35.x86_64/drivers/media/video/indycam.c @@ -24,7 +24,6 @@ #include #include @@ -101893,9 +102436,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/indycam.c linux-2.6.35.x86_6 + +module_init(init_indycam); +module_exit(exit_indycam); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ir-kbd-i2c.c linux-2.6.35.x86_64.new/drivers/media/video/ir-kbd-i2c.c ---- linux-2.6.35.x86_64/drivers/media/video/ir-kbd-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ir-kbd-i2c.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ir-kbd-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ir-kbd-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/video/ir-kbd-i2c.c @@ -44,10 +44,9 @@ #include #include @@ -102165,9 +102709,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ir-kbd-i2c.c linux-2.6.35.x8 /* free memory */ kfree(ir); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-cards.c linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-cards.c ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-cards.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-cards.c ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-cards.c @@ -65,7 +65,7 @@ static struct ivtv_card_tuner_i2c ivtv_i /********************** card configuration *******************************/ @@ -102177,9 +102722,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-cards.c linux-2.6. This keeps the PCI ID database up to date. Note that the entries must be added under vendor 0x4444 (Conexant) as subsystem IDs. New vendor IDs should still be added to the vendor ID list. */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-controls.c linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-controls.c ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-controls.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-controls.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-controls.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-controls.c ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-controls.c @@ -17,163 +17,14 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -102483,9 +103029,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-controls.c linux-2 + .s_video_encoding = ivtv_s_video_encoding, + .s_stream_vbi_fmt = ivtv_s_stream_vbi_fmt, +}; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-controls.h linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-controls.h ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-controls.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-controls.h 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-controls.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-controls.h ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-controls.h @@ -21,10 +21,6 @@ #ifndef IVTV_CONTROLS_H #define IVTV_CONTROLS_H @@ -102498,9 +103045,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-controls.h linux-2 +extern struct cx2341x_handler_ops ivtv_cxhdl_ops; #endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-driver.c ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-driver.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-driver.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-driver.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-driver.c ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-driver.c @@ -53,6 +53,7 @@ #include "ivtv-cards.h" #include "ivtv-vbi.h" @@ -102618,9 +103166,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-driver.c linux-2.6 module_init(module_start); module_exit(module_cleanup); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-driver.h linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-driver.h ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-driver.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-driver.h 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-driver.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-driver.h ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-driver.h @@ -62,6 +62,7 @@ #include #include @@ -102691,9 +103240,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-driver.h linux-2.6 #define ivtv_call_all_err(itv, o, f, args...) ivtv_call_hw_err(itv, 0, o, f , ##args) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtvfb.c linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtvfb.c ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtvfb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtvfb.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtvfb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtvfb.c ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtvfb.c @@ -53,6 +53,7 @@ #include "ivtv-i2c.h" #include "ivtv-udma.h" @@ -102845,9 +103395,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtvfb.c linux-2.6.35.x ivtvfb_blank(FB_BLANK_VSYNC_SUSPEND, &oi->ivtvfb_info); ivtvfb_release_buffers(itv); itv->osd_video_pbase = 0; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-fileops.c linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-fileops.c ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-fileops.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-fileops.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-fileops.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-fileops.c ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-fileops.c @@ -32,6 +32,7 @@ #include "ivtv-yuv.h" #include "ivtv-ioctl.h" @@ -102958,9 +103509,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-fileops.c linux-2. if (s->type == IVTV_DEC_STREAM_TYPE_MPG && test_bit(IVTV_F_S_CLAIMED, &itv->streams[IVTV_DEC_STREAM_TYPE_YUV].s_flags)) return -EBUSY; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-firmware.c linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-firmware.c ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-firmware.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-firmware.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-firmware.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-firmware.c ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-firmware.c @@ -23,7 +23,10 @@ #include "ivtv-mailbox.h" #include "ivtv-firmware.h" @@ -103108,9 +103660,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-firmware.c linux-2 + + return res; +} -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-firmware.h linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-firmware.h ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-firmware.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-firmware.h 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-firmware.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-firmware.h ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-firmware.h @@ -26,5 +26,6 @@ int ivtv_firmware_init(struct ivtv *itv) void ivtv_firmware_versions(struct ivtv *itv); void ivtv_halt_firmware(struct ivtv *itv); @@ -103118,9 +103671,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-firmware.h linux-2 +int ivtv_firmware_check(struct ivtv *itv, char *where); #endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-gpio.c linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-gpio.c ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-gpio.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-gpio.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-gpio.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-gpio.c ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-gpio.c @@ -24,6 +24,7 @@ #include "ivtv-gpio.h" #include "tuner-xc2028.h" @@ -103247,9 +103801,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-gpio.c linux-2.6.3 + v4l2_ctrl_handler_setup(&itv->hdl_gpio); return v4l2_device_register_subdev(&itv->v4l2_dev, &itv->sd_gpio); } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-i2c.c linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-i2c.c ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-i2c.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-i2c.c @@ -63,6 +63,7 @@ #include "ivtv-cards.h" #include "ivtv-gpio.h" @@ -103400,9 +103955,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-i2c.c linux-2.6.35 IVTV_ERR("Mismatched I2C hardware arrays\n"); return -ENODEV; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-ioctl.c linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-ioctl.c ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-ioctl.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-ioctl.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-ioctl.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-ioctl.c ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-ioctl.c @@ -37,7 +37,6 @@ #include #include @@ -103503,9 +104059,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-ioctl.c linux-2.6. .vidioc_subscribe_event = ivtv_subscribe_event, .vidioc_unsubscribe_event = v4l2_event_unsubscribe, }; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-mailbox.c linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-mailbox.c ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-mailbox.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-mailbox.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-mailbox.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-mailbox.c ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-mailbox.c @@ -377,3 +377,11 @@ void ivtv_api_get_data(struct ivtv_mailb for (i = 0; i < argc; i++, p++) data[i] = readl(p); @@ -103518,9 +104075,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-mailbox.c linux-2. + for (i = 0; i < 256; i++) + itv->api_cache[i].last_jiffies = 0; +} -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-mailbox.h linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-mailbox.h ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-mailbox.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-mailbox.h 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-mailbox.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-mailbox.h ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-mailbox.h @@ -30,5 +30,6 @@ int ivtv_api(struct ivtv *itv, int cmd, int ivtv_vapi_result(struct ivtv *itv, u32 data[CX2341X_MBOX_MAX_DATA], int cmd, int args, ...); int ivtv_vapi(struct ivtv *itv, int cmd, int args, ...); @@ -103528,9 +104086,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-mailbox.h linux-2. +void ivtv_mailbox_cache_invalidate(struct ivtv *itv); #endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-streams.c linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-streams.c ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-streams.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-streams.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-streams.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-streams.c ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-streams.c @@ -42,6 +42,7 @@ #include "ivtv-yuv.h" #include "ivtv-cards.h" @@ -103672,9 +104231,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-streams.c linux-2. return 0; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-version.h linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-version.h ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-version.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/ivtv-version.h 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-version.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/ivtv-version.h ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-version.h @@ -23,7 +23,7 @@ #define IVTV_DRIVER_NAME "ivtv" #define IVTV_DRIVER_VERSION_MAJOR 1 @@ -103684,9 +104244,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/ivtv-version.h linux-2. #define IVTV_VERSION __stringify(IVTV_DRIVER_VERSION_MAJOR) "." __stringify(IVTV_DRIVER_VERSION_MINOR) "." __stringify(IVTV_DRIVER_VERSION_PATCHLEVEL) #define IVTV_DRIVER_VERSION KERNEL_VERSION(IVTV_DRIVER_VERSION_MAJOR,IVTV_DRIVER_VERSION_MINOR,IVTV_DRIVER_VERSION_PATCHLEVEL) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/ivtv/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/ivtv/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ivtv/Kconfig 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ivtv/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ivtv/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/ivtv/Kconfig @@ -1,9 +1,8 @@ config VIDEO_IVTV tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support" @@ -103698,9 +104259,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ivtv/Kconfig linux-2.6.35.x8 select VIDEO_TUNER select VIDEO_TVEEPROM select VIDEO_CX2341X -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/Kconfig 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/Kconfig @@ -83,7 +83,7 @@ config VIDEO_FIXED_MINOR_RANGES config VIDEO_HELPER_CHIPS_AUTO @@ -104171,9 +104733,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/Kconfig linux-2.6.35.x86_64. + (video postprocessor) + endif # V4L_MEM2MEM_DRIVERS -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ks0127.c linux-2.6.35.x86_64.new/drivers/media/video/ks0127.c ---- linux-2.6.35.x86_64/drivers/media/video/ks0127.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ks0127.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ks0127.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ks0127.c ++++ linux-2.6.35.x86_64/drivers/media/video/ks0127.c @@ -43,7 +43,6 @@ #include #include @@ -104213,9 +104776,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ks0127.c linux-2.6.35.x86_64 + +module_init(init_ks0127); +module_exit(exit_ks0127); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/m52790.c linux-2.6.35.x86_64.new/drivers/media/video/m52790.c ---- linux-2.6.35.x86_64/drivers/media/video/m52790.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/m52790.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/m52790.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/m52790.c ++++ linux-2.6.35.x86_64/drivers/media/video/m52790.c @@ -26,12 +26,10 @@ #include #include @@ -104260,9 +104824,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/m52790.c linux-2.6.35.x86_64 + +module_init(init_m52790); +module_exit(exit_m52790); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/Makefile linux-2.6.35.x86_64.new/drivers/media/video/Makefile ---- linux-2.6.35.x86_64/drivers/media/video/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/Makefile 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/Makefile ++++ linux-2.6.35.x86_64/drivers/media/video/Makefile @@ -11,7 +11,7 @@ stkwebcam-objs := stk-webcam.o stk-senso omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o @@ -104373,9 +104938,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/Makefile linux-2.6.35.x86_64 obj-$(CONFIG_ARCH_OMAP) += omap/ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mem2mem_testdev.c linux-2.6.35.x86_64.new/drivers/media/video/mem2mem_testdev.c ---- linux-2.6.35.x86_64/drivers/media/video/mem2mem_testdev.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/mem2mem_testdev.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/mem2mem_testdev.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/mem2mem_testdev.c ++++ linux-2.6.35.x86_64/drivers/media/video/mem2mem_testdev.c @@ -239,7 +239,7 @@ static int device_process(struct m2mtest return -EFAULT; } @@ -104419,9 +104985,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mem2mem_testdev.c linux-2.6. v4l2_device_unregister(&dev->v4l2_dev); kfree(dev); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/msp3400-driver.c linux-2.6.35.x86_64.new/drivers/media/video/msp3400-driver.c ---- linux-2.6.35.x86_64/drivers/media/video/msp3400-driver.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/msp3400-driver.c 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/msp3400-driver.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/msp3400-driver.c ++++ linux-2.6.35.x86_64/drivers/media/video/msp3400-driver.c @@ -56,7 +56,6 @@ #include #include @@ -104832,9 +105399,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/msp3400-driver.c linux-2.6.3 /* * Overrides for Emacs so that we follow Linus's tabbing style. * --------------------------------------------------------------------------- -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/msp3400-driver.h linux-2.6.35.x86_64.new/drivers/media/video/msp3400-driver.h ---- linux-2.6.35.x86_64/drivers/media/video/msp3400-driver.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/msp3400-driver.h 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/msp3400-driver.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/msp3400-driver.h ++++ linux-2.6.35.x86_64/drivers/media/video/msp3400-driver.h @@ -6,6 +6,7 @@ #include @@ -104888,9 +105456,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/msp3400-driver.h linux-2.6.3 int msp_sleep(struct msp_state *state, int timeout); /* msp3400-kthreads.c */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/msp3400-kthreads.c linux-2.6.35.x86_64.new/drivers/media/video/msp3400-kthreads.c ---- linux-2.6.35.x86_64/drivers/media/video/msp3400-kthreads.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/msp3400-kthreads.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/msp3400-kthreads.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/msp3400-kthreads.c ++++ linux-2.6.35.x86_64/drivers/media/video/msp3400-kthreads.c @@ -496,13 +496,13 @@ restart: v4l_dbg(1, msp_debug, client, "thread: no carrier scan\n"); @@ -104959,9 +105528,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/msp3400-kthreads.c linux-2.6 /* restore ACB */ if (msp_write_dsp(client, 0x13, state->acb)) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mt9m001.c linux-2.6.35.x86_64.new/drivers/media/video/mt9m001.c ---- linux-2.6.35.x86_64/drivers/media/video/mt9m001.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/mt9m001.c 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/mt9m001.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/mt9m001.c ++++ linux-2.6.35.x86_64/drivers/media/video/mt9m001.c @@ -157,7 +157,7 @@ static int mt9m001_init(struct i2c_clien static int mt9m001_s_stream(struct v4l2_subdev *sd, int enable) @@ -105087,9 +105657,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mt9m001.c linux-2.6.35.x86_6 kfree(mt9m001); return 0; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mt9m111.c linux-2.6.35.x86_64.new/drivers/media/video/mt9m111.c ---- linux-2.6.35.x86_64/drivers/media/video/mt9m111.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/mt9m111.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/mt9m111.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/mt9m111.c ++++ linux-2.6.35.x86_64/drivers/media/video/mt9m111.c @@ -1,5 +1,5 @@ /* - * Driver for MT9M111/MT9M112 CMOS Image Sensor from Micron @@ -105415,9 +105986,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mt9m111.c linux-2.6.35.x86_6 +MODULE_DESCRIPTION("Micron/Aptina MT9M111/MT9M112/MT9M131 Camera driver"); MODULE_AUTHOR("Robert Jarzmik"); MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mt9t031.c linux-2.6.35.x86_64.new/drivers/media/video/mt9t031.c ---- linux-2.6.35.x86_64/drivers/media/video/mt9t031.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/mt9t031.c 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/mt9t031.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/mt9t031.c ++++ linux-2.6.35.x86_64/drivers/media/video/mt9t031.c @@ -163,7 +163,7 @@ static int mt9t031_disable(struct i2c_cl static int mt9t031_s_stream(struct v4l2_subdev *sd, int enable) @@ -105534,9 +106106,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mt9t031.c linux-2.6.35.x86_6 kfree(mt9t031); return 0; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mt9t112.c linux-2.6.35.x86_64.new/drivers/media/video/mt9t112.c ---- linux-2.6.35.x86_64/drivers/media/video/mt9t112.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/mt9t112.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/mt9t112.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/mt9t112.c ++++ linux-2.6.35.x86_64/drivers/media/video/mt9t112.c @@ -121,22 +121,22 @@ struct mt9t112_priv { static const struct mt9t112_format mt9t112_cfmts[] = { @@ -105636,9 +106209,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mt9t112.c linux-2.6.35.x86_6 /* TODO: set colorspace */ return mt9t112_set_params(client, mf->width, mf->height, mf->code); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mt9v011.c linux-2.6.35.x86_64.new/drivers/media/video/mt9v011.c ---- linux-2.6.35.x86_64/drivers/media/video/mt9v011.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/mt9v011.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/mt9v011.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/mt9v011.c ++++ linux-2.6.35.x86_64/drivers/media/video/mt9v011.c @@ -11,9 +11,8 @@ #include #include @@ -105681,9 +106255,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mt9v011.c linux-2.6.35.x86_6 + +module_init(init_mt9v011); +module_exit(exit_mt9v011); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mt9v022.c linux-2.6.35.x86_64.new/drivers/media/video/mt9v022.c ---- linux-2.6.35.x86_64/drivers/media/video/mt9v022.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/mt9v022.c 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/mt9v022.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/mt9v022.c ++++ linux-2.6.35.x86_64/drivers/media/video/mt9v022.c @@ -184,7 +184,7 @@ static int mt9v022_init(struct i2c_clien static int mt9v022_s_stream(struct v4l2_subdev *sd, int enable) @@ -105819,9 +106394,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mt9v022.c linux-2.6.35.x86_6 kfree(mt9v022); return 0; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mx1_camera.c linux-2.6.35.x86_64.new/drivers/media/video/mx1_camera.c ---- linux-2.6.35.x86_64/drivers/media/video/mx1_camera.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/mx1_camera.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/mx1_camera.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/mx1_camera.c ++++ linux-2.6.35.x86_64/drivers/media/video/mx1_camera.c @@ -161,7 +161,7 @@ static void free_buffer(struct videobuf_ * This waits until this buffer is out of danger, i.e., until it is no * longer in STATE_QUEUED or STATE_ACTIVE @@ -105871,9 +106447,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mx1_camera.c linux-2.6.35.x8 vb.stream); poll_wait(file, &buf->vb.done, pt); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mx2_camera.c linux-2.6.35.x86_64.new/drivers/media/video/mx2_camera.c ---- linux-2.6.35.x86_64/drivers/media/video/mx2_camera.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/mx2_camera.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/mx2_camera.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/mx2_camera.c @@ -0,0 +1,1524 @@ +/* + * V4L2 Driver for i.MX27/i.MX25 camera host @@ -107399,9 +107976,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mx2_camera.c linux-2.6.35.x8 +MODULE_DESCRIPTION("i.MX27/i.MX25 SoC Camera Host driver"); +MODULE_AUTHOR("Sascha Hauer "); +MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mx3_camera.c linux-2.6.35.x86_64.new/drivers/media/video/mx3_camera.c ---- linux-2.6.35.x86_64/drivers/media/video/mx3_camera.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/mx3_camera.c 2010-12-15 11:52:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/mx3_camera.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/mx3_camera.c ++++ linux-2.6.35.x86_64/drivers/media/video/mx3_camera.c @@ -27,6 +27,7 @@ #include @@ -107460,9 +108038,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mx3_camera.c linux-2.6.35.x8 } static int mx3_camera_querycap(struct soc_camera_host *ici, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mxb.c linux-2.6.35.x86_64.new/drivers/media/video/mxb.c ---- linux-2.6.35.x86_64/drivers/media/video/mxb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/mxb.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/mxb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/mxb.c ++++ linux-2.6.35.x86_64/drivers/media/video/mxb.c @@ -3,7 +3,7 @@ Copyright (C) 1998-2006 Michael Hunold @@ -107508,9 +108087,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/mxb.c linux-2.6.35.x86_64.ne /* check if all devices are present */ if (!mxb->tea6420_1 || !mxb->tea6420_2 || !mxb->tea6415c || -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/omap/omap_vout.c linux-2.6.35.x86_64.new/drivers/media/video/omap/omap_vout.c ---- linux-2.6.35.x86_64/drivers/media/video/omap/omap_vout.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/omap/omap_vout.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/omap/omap_vout.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/omap/omap_vout.c ++++ linux-2.6.35.x86_64/drivers/media/video/omap/omap_vout.c @@ -1341,7 +1341,7 @@ static int omap_vout_open(struct file *f videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev, @@ -107540,9 +108120,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/omap/omap_vout.c linux-2.6.3 } else { if (dssdrv->set_update_mode) dssdrv->set_update_mode(def_display, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/omap1_camera.c linux-2.6.35.x86_64.new/drivers/media/video/omap1_camera.c ---- linux-2.6.35.x86_64/drivers/media/video/omap1_camera.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/omap1_camera.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/omap1_camera.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/omap1_camera.c @@ -0,0 +1,1702 @@ +/* + * V4L2 SoC Camera driver for OMAP1 Camera Interface @@ -109246,9 +109827,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/omap1_camera.c linux-2.6.35. +MODULE_AUTHOR("Janusz Krzysztofik "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRIVER_NAME); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/omap24xxcam.c linux-2.6.35.x86_64.new/drivers/media/video/omap24xxcam.c ---- linux-2.6.35.x86_64/drivers/media/video/omap24xxcam.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/omap24xxcam.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/omap24xxcam.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/omap24xxcam.c ++++ linux-2.6.35.x86_64/drivers/media/video/omap24xxcam.c @@ -420,13 +420,13 @@ static void omap24xxcam_vbq_release(stru struct videobuf_dmabuf *dma = videobuf_to_dma(vb); @@ -109274,9 +109856,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/omap24xxcam.c linux-2.6.35.x return 0; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ov6650.c linux-2.6.35.x86_64.new/drivers/media/video/ov6650.c ---- linux-2.6.35.x86_64/drivers/media/video/ov6650.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ov6650.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ov6650.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/ov6650.c @@ -0,0 +1,1221 @@ +/* + * V4L2 SoC Camera driver for OmniVision OV6650 Camera Sensor @@ -110499,9 +111082,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ov6650.c linux-2.6.35.x86_64 +MODULE_DESCRIPTION("SoC Camera driver for OmniVision OV6650"); +MODULE_AUTHOR("Janusz Krzysztofik "); +MODULE_LICENSE("GPL v2"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ov7670.c linux-2.6.35.x86_64.new/drivers/media/video/ov7670.c ---- linux-2.6.35.x86_64/drivers/media/video/ov7670.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ov7670.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ov7670.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ov7670.c ++++ linux-2.6.35.x86_64/drivers/media/video/ov7670.c @@ -18,8 +18,9 @@ #include #include @@ -111006,9 +111590,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ov7670.c linux-2.6.35.x86_64 + +module_init(init_ov7670); +module_exit(exit_ov7670); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ov7670.h linux-2.6.35.x86_64.new/drivers/media/video/ov7670.h ---- linux-2.6.35.x86_64/drivers/media/video/ov7670.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ov7670.h 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ov7670.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/ov7670.h @@ -0,0 +1,20 @@ +/* + * A V4L2 driver for OmniVision OV7670 cameras. @@ -111030,9 +111615,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ov7670.h linux-2.6.35.x86_64 +}; + +#endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ov772x.c linux-2.6.35.x86_64.new/drivers/media/video/ov772x.c ---- linux-2.6.35.x86_64/drivers/media/video/ov772x.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ov772x.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ov772x.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ov772x.c ++++ linux-2.6.35.x86_64/drivers/media/video/ov772x.c @@ -440,21 +440,21 @@ static const struct regval_list ov772x_v */ static const struct ov772x_color_format ov772x_cfmts[] = { @@ -111146,9 +111732,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ov772x.c linux-2.6.35.x86_64 struct ov772x_priv *priv = to_ov772x(client); const struct ov772x_win_size *win; int i; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ov9640.c linux-2.6.35.x86_64.new/drivers/media/video/ov9640.c ---- linux-2.6.35.x86_64/drivers/media/video/ov9640.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/ov9640.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/ov9640.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/ov9640.c ++++ linux-2.6.35.x86_64/drivers/media/video/ov9640.c @@ -155,7 +155,7 @@ static const struct ov9640_reg ov9640_re }; @@ -111252,9 +111839,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/ov9640.c linux-2.6.35.x86_64 mf->colorspace = V4L2_COLORSPACE_JPEG; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-ctrl.c linux-2.6.35.x86_64.new/drivers/media/video/pvrusb2/pvrusb2-ctrl.c ---- linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-ctrl.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/pvrusb2/pvrusb2-ctrl.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-ctrl.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/pvrusb2/pvrusb2-ctrl.c ++++ linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-ctrl.c @@ -513,7 +513,7 @@ int pvr2_ctrl_sym_to_value(struct pvr2_c if (ret >= 0) { ret = pvr2_ctrl_range_check(cptr,*valptr); @@ -111282,9 +111870,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-ctrl.c linux } else if (cptr->info->type == pvr2_ctl_bitmask) { ret = parse_tlist( ptr,len,maskptr,valptr, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-debugifc.c linux-2.6.35.x86_64.new/drivers/media/video/pvrusb2/pvrusb2-debugifc.c ---- linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-debugifc.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/pvrusb2/pvrusb2-debugifc.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-debugifc.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/pvrusb2/pvrusb2-debugifc.c ++++ linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-debugifc.c @@ -94,8 +94,6 @@ static int debugifc_parse_unsigned_numbe u32 *num_ptr) { @@ -111314,9 +111903,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-debugifc.c l result *= radix; result += val; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-hdw.c linux-2.6.35.x86_64.new/drivers/media/video/pvrusb2/pvrusb2-hdw.c ---- linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-hdw.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/pvrusb2/pvrusb2-hdw.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-hdw.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/pvrusb2/pvrusb2-hdw.c ++++ linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -2082,29 +2082,20 @@ static int pvr2_hdw_load_subdev(struct p return -EINVAL; } @@ -111349,9 +111939,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-hdw.c linux- } if (!sd) { -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-ioread.c linux-2.6.35.x86_64.new/drivers/media/video/pvrusb2/pvrusb2-ioread.c ---- linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-ioread.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/pvrusb2/pvrusb2-ioread.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-ioread.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/pvrusb2/pvrusb2-ioread.c ++++ linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-ioread.c @@ -223,7 +223,10 @@ int pvr2_ioread_setup(struct pvr2_ioread " pvr2_ioread_setup (setup) id=%p",cp); pvr2_stream_kill(sp); @@ -111364,9 +111955,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pvrusb2/pvrusb2-ioread.c lin for (idx = 0; idx < BUFFER_COUNT; idx++) { bp = pvr2_stream_get_buffer(sp,idx); pvr2_buffer_set_buffer(bp, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/pwc/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/pwc/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/pwc/Kconfig 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/pwc/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/pwc/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/pwc/Kconfig @@ -1,6 +1,6 @@ config USB_PWC tristate "USB Philips Cameras" @@ -111375,9 +111967,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/Kconfig linux-2.6.35.x86 ---help--- Say Y or M here if you want to use one of these Philips & OEM webcams: -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-ctrl.c linux-2.6.35.x86_64.new/drivers/media/video/pwc/pwc-ctrl.c ---- linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-ctrl.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/pwc/pwc-ctrl.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-ctrl.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/pwc/pwc-ctrl.c ++++ linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-ctrl.c @@ -261,7 +261,7 @@ static int set_video_mode_Nala(struct pw PWC_DEBUG_MODULE("Failed to send video command... %d\n", ret); return ret; @@ -111460,9 +112053,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-ctrl.c linux-2.6.35. if (ret >= 0) pdev->vcompression = ARGR(qual); break; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/pwc.h linux-2.6.35.x86_64.new/drivers/media/video/pwc/pwc.h ---- linux-2.6.35.x86_64/drivers/media/video/pwc/pwc.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/pwc/pwc.h 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/pwc/pwc.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/pwc/pwc.h ++++ linux-2.6.35.x86_64/drivers/media/video/pwc/pwc.h @@ -34,7 +34,7 @@ #include #include @@ -111498,9 +112092,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/pwc.h linux-2.6.35.x86_6 int pwc_handle_frame(struct pwc_device *pdev); void pwc_next_image(struct pwc_device *pdev); int pwc_isoc_init(struct pwc_device *pdev); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-if.c linux-2.6.35.x86_64.new/drivers/media/video/pwc/pwc-if.c ---- linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-if.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/pwc/pwc-if.c 2010-12-15 11:52:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-if.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/pwc/pwc-if.c ++++ linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-if.c @@ -163,7 +163,7 @@ static const struct v4l2_file_operations .read = pwc_video_read, .poll = pwc_video_poll, @@ -111729,9 +112324,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-if.c linux-2.6.35.x8 } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-misc.c linux-2.6.35.x86_64.new/drivers/media/video/pwc/pwc-misc.c ---- linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-misc.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/pwc/pwc-misc.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-misc.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/pwc/pwc-misc.c ++++ linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-misc.c @@ -47,7 +47,7 @@ int pwc_decode_size(struct pwc_device *p you don't have the decompressor loaded or use RAW mode, the maximum viewable size is smaller. @@ -111750,9 +112346,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-misc.c linux-2.6.35. pdev->view_min.size = pdev->view_min.x * pdev->view_min.y; pdev->view_max.size = pdev->view_max.x * pdev->view_max.y; /* length of image, in YUV format; always allocate enough memory. */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-uncompress.c linux-2.6.35.x86_64.new/drivers/media/video/pwc/pwc-uncompress.c ---- linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-uncompress.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/pwc/pwc-uncompress.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-uncompress.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/pwc/pwc-uncompress.c ++++ linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-uncompress.c @@ -54,7 +54,7 @@ int pwc_decompress(struct pwc_device *pd yuv = fbuf->data + pdev->frame_header_size; /* Skip header */ @@ -111762,9 +112359,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-uncompress.c linux-2 { struct pwc_raw_frame *raw_frame = image; raw_frame->type = cpu_to_le16(pdev->type); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-v4l.c linux-2.6.35.x86_64.new/drivers/media/video/pwc/pwc-v4l.c ---- linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-v4l.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/pwc/pwc-v4l.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-v4l.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/pwc/pwc-v4l.c ++++ linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-v4l.c @@ -216,7 +216,7 @@ static void pwc_vidioc_fill_fmt(const st f->fmt.pix.width = pdev->view.x; f->fmt.pix.height = pdev->view.y; @@ -112167,9 +112765,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pwc/pwc-v4l.c linux-2.6.35.x } case VIDIOC_STREAMOFF: -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pxa_camera.c linux-2.6.35.x86_64.new/drivers/media/video/pxa_camera.c ---- linux-2.6.35.x86_64/drivers/media/video/pxa_camera.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/pxa_camera.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/pxa_camera.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/pxa_camera.c ++++ linux-2.6.35.x86_64/drivers/media/video/pxa_camera.c @@ -275,8 +275,8 @@ static void free_buffer(struct videobuf_ * This waits until this buffer is out of danger, i.e., until it is no * longer in STATE_QUEUED or STATE_ACTIVE @@ -112243,9 +112842,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/pxa_camera.c linux-2.6.35.x8 vb.stream); poll_wait(file, &buf->vb.done, pt); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/rj54n1cb0c.c linux-2.6.35.x86_64.new/drivers/media/video/rj54n1cb0c.c ---- linux-2.6.35.x86_64/drivers/media/video/rj54n1cb0c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/rj54n1cb0c.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/rj54n1cb0c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/rj54n1cb0c.c ++++ linux-2.6.35.x86_64/drivers/media/video/rj54n1cb0c.c @@ -1,5 +1,5 @@ /* - * Driver for RJ54N1CB0C CMOS Image Sensor from Micron @@ -112404,9 +113004,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/rj54n1cb0c.c linux-2.6.35.x8 kfree(rj54n1); return 0; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/s2255drv.c linux-2.6.35.x86_64.new/drivers/media/video/s2255drv.c ---- linux-2.6.35.x86_64/drivers/media/video/s2255drv.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/s2255drv.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/s2255drv.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/s2255drv.c ++++ linux-2.6.35.x86_64/drivers/media/video/s2255drv.c @@ -191,7 +191,6 @@ struct s2255_bufferi { struct s2255_dmaqueue { struct list_head active; @@ -113902,9 +114503,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/s2255drv.c linux-2.6.35.x86_ s2255_destroy(dev); dev_info(&interface->dev, "%s\n", __func__); } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-capture.c linux-2.6.35.x86_64.new/drivers/media/video/s5p-fimc/fimc-capture.c ---- linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-capture.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/s5p-fimc/fimc-capture.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-capture.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-capture.c @@ -0,0 +1,819 @@ +/* + * Samsung S5P SoC series camera interface (camera capture) driver @@ -114725,9 +115327,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-capture.c linu + + kfree(capture->ctx); +} -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-core.c linux-2.6.35.x86_64.new/drivers/media/video/s5p-fimc/fimc-core.c ---- linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-core.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/s5p-fimc/fimc-core.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-core.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-core.c @@ -0,0 +1,1832 @@ +/* + * S5P camera interface (video postprocessor) driver @@ -116561,9 +117164,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-core.c linux-2 +MODULE_AUTHOR("Sylwester Nawrocki "); +MODULE_DESCRIPTION("S5P FIMC camera host interface/video postprocessor driver"); +MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-core.h linux-2.6.35.x86_64.new/drivers/media/video/s5p-fimc/fimc-core.h ---- linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-core.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/s5p-fimc/fimc-core.h 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-core.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-core.h @@ -0,0 +1,690 @@ +/* + * Copyright (c) 2010 Samsung Electronics @@ -117255,9 +117859,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-core.h linux-2 + + +#endif /* FIMC_CORE_H_ */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-reg.c linux-2.6.35.x86_64.new/drivers/media/video/s5p-fimc/fimc-reg.c ---- linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-reg.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/s5p-fimc/fimc-reg.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-reg.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-reg.c @@ -0,0 +1,668 @@ +/* + * Register interface file for Samsung Camera Interface (FIMC) driver @@ -117927,16 +118532,18 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/fimc-reg.c linux-2. + + return 0; +} -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/Makefile linux-2.6.35.x86_64.new/drivers/media/video/s5p-fimc/Makefile ---- linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/s5p-fimc/Makefile 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/Makefile +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/Makefile @@ -0,0 +1,3 @@ + +obj-$(CONFIG_VIDEO_SAMSUNG_S5P_FIMC) := s5p-fimc.o +s5p-fimc-y := fimc-core.o fimc-reg.o fimc-capture.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/regs-fimc.h linux-2.6.35.x86_64.new/drivers/media/video/s5p-fimc/regs-fimc.h ---- linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/regs-fimc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/s5p-fimc/regs-fimc.h 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/regs-fimc.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/regs-fimc.h @@ -0,0 +1,285 @@ +/* + * Register definition file for Samsung Camera Interface (FIMC) driver @@ -118223,9 +118830,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/s5p-fimc/regs-fimc.h linux-2 +#define S5P_CIFCNTSEQ 0x1FC + +#endif /* REGS_FIMC_H_ */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa6588.c linux-2.6.35.x86_64.new/drivers/media/video/saa6588.c ---- linux-2.6.35.x86_64/drivers/media/video/saa6588.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa6588.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa6588.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa6588.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa6588.c @@ -34,7 +34,6 @@ #include #include @@ -118274,9 +118882,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa6588.c linux-2.6.35.x86_6 + +module_init(init_saa6588); +module_exit(exit_saa6588); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7110.c linux-2.6.35.x86_64.new/drivers/media/video/saa7110.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7110.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7110.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7110.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7110.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7110.c @@ -36,7 +36,6 @@ #include #include @@ -118316,9 +118925,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7110.c linux-2.6.35.x86_6 + +module_init(init_saa7110); +module_exit(exit_saa7110); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7115.c linux-2.6.35.x86_64.new/drivers/media/video/saa7115.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7115.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7115.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7115.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7115.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7115.c @@ -45,8 +45,8 @@ #include #include @@ -118655,9 +119265,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7115.c linux-2.6.35.x86_6 + +module_init(init_saa711x); +module_exit(exit_saa711x); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7127.c linux-2.6.35.x86_64.new/drivers/media/video/saa7127.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7127.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7127.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7127.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7127.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7127.c @@ -55,7 +55,6 @@ #include #include @@ -118697,9 +119308,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7127.c linux-2.6.35.x86_6 + +module_init(init_saa7127); +module_exit(exit_saa7127); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/saa7134/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/saa7134/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7134/Kconfig 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7134/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7134/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/saa7134/Kconfig @@ -1,8 +1,7 @@ config VIDEO_SAA7134 tristate "Philips SAA7134 support" @@ -118725,9 +119337,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/Kconfig linux-2.6.35 config VIDEO_SAA7134_DVB tristate "DVB/ATSC Support for saa7134 based TV cards" depends on VIDEO_SAA7134 && DVB_CORE -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/Makefile linux-2.6.35.x86_64.new/drivers/media/video/saa7134/Makefile ---- linux-2.6.35.x86_64/drivers/media/video/saa7134/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7134/Makefile 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7134/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7134/Makefile ++++ linux-2.6.35.x86_64/drivers/media/video/saa7134/Makefile @@ -1,7 +1,8 @@ -saa7134-objs := saa7134-cards.o saa7134-core.o saa7134-i2c.o \ @@ -118740,9 +119353,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/Makefile linux-2.6.3 obj-$(CONFIG_VIDEO_SAA7134) += saa6752hs.o saa7134.o saa7134-empress.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa6752hs.c linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa6752hs.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7134/saa6752hs.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa6752hs.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7134/saa6752hs.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7134/saa6752hs.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7134/saa6752hs.c @@ -36,7 +36,6 @@ #include #include @@ -118786,9 +119400,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa6752hs.c linux-2. /* * Overrides for Emacs so that we follow Linus's tabbing style. * --------------------------------------------------------------------------- -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-alsa.c linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-alsa.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-alsa.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-alsa.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-alsa.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7134/saa7134-alsa.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-alsa.c @@ -630,7 +630,7 @@ static int snd_card_saa7134_hw_params(st /* release the old buffer */ if (substream->runtime->dma_area) { @@ -118849,9 +119464,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-alsa.c linux spin_lock_init(&chip->lock); spin_lock_init(&chip->mixer_lock); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-cards.c linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-cards.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-cards.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7134/saa7134-cards.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-cards.c @@ -4323,13 +4323,13 @@ struct saa7134_board saa7134_boards[] = }, [SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM] = { @@ -118974,19 +119590,19 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-cards.c linu .subvendor = 0x1461, /* Avermedia Technologies Inc */ .subdevice = 0xf31d, .driver_data = SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS, -@@ -6631,6 +6713,12 @@ struct pci_device_id saa7134_pci_tbl[] = - .subdevice = 0x6655, - .driver_data = SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S, +@@ -6633,6 +6715,12 @@ struct pci_device_id saa7134_pci_tbl[] = }, { -+ .vendor = PCI_VENDOR_ID_PHILIPS, -+ .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x13c2, + .subdevice = 0x2804, + .driver_data = SAA7134_BOARD_TECHNOTREND_BUDGET_T3000, + }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7133, ++ .vendor = PCI_VENDOR_ID_PHILIPS, ++ .device = PCI_DEVICE_ID_PHILIPS_SAA7133, .subvendor = 0x5ace, /* Beholder Intl. Ltd. */ + .subdevice = 0x7190, + .driver_data = SAA7134_BOARD_BEHOLD_H7, @@ -6801,6 +6889,23 @@ static inline int saa7134_tda18271_hvr11 return 0; } @@ -119102,9 +119718,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-cards.c linu dev->tuner_addr, NULL); } } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-core.c linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-core.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-core.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7134/saa7134-core.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-core.c @@ -255,8 +255,8 @@ void saa7134_dma_free(struct videobuf_qu struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); BUG_ON(in_interrupt()); @@ -119134,9 +119751,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-core.c linux 0, I2C_ADDRS(saa7134_boards[dev->board].rds_addr)); if (sd) { printk(KERN_INFO "%s: found RDS decoder\n", dev->name); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-dvb.c linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-dvb.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-dvb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-dvb.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-dvb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7134/saa7134-dvb.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-dvb.c @@ -52,6 +52,7 @@ #include "tda18271.h" #include "lgdt3305.h" @@ -119280,9 +119898,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-dvb.c linux- default: wprintk("Huh? unknown DVB card?\n"); break; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-empress.c linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-empress.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-empress.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-empress.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-empress.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7134/saa7134-empress.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-empress.c @@ -542,7 +542,7 @@ static int empress_init(struct saa7134_d V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_ALTERNATE, @@ -119292,9 +119911,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-empress.c li empress_signal_update(&dev->empress_workqueue); return 0; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134.h linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134.h ---- linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134.h 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7134/saa7134.h ++++ linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134.h @@ -37,7 +37,7 @@ #include #include @@ -119375,9 +119995,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134.h linux-2.6. +#define saa7134_ir_start(dev) (0) +#define saa7134_ir_stop(dev) (0) +#endif -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-i2c.c linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-i2c.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-i2c.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7134/saa7134-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-i2c.c @@ -328,7 +328,6 @@ static struct i2c_algorithm saa7134_algo static struct i2c_adapter saa7134_adap_template = { .owner = THIS_MODULE, @@ -119386,9 +120007,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-i2c.c linux- .algo = &saa7134_algo, }; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-input.c linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-input.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-input.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-input.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-input.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7134/saa7134-input.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-input.c @@ -22,7 +22,6 @@ #include #include @@ -120102,9 +120724,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-input.c linu - - return 1; -} -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-tvaudio.c linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-tvaudio.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-tvaudio.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-tvaudio.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-tvaudio.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7134/saa7134-tvaudio.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-tvaudio.c @@ -550,16 +550,16 @@ static int tvaudio_thread(void *data) } else if (0 != dev->last_carrier) { /* no carrier -- try last detected one as fallback */ @@ -120128,9 +120751,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-tvaudio.c li } tvaudio_setcarrier(dev,carrier,carrier); dev->automute = 0; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-video.c linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-video.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-video.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7134/saa7134-video.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7134/saa7134-video.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-video.c @@ -1366,13 +1366,13 @@ static int video_open(struct file *file) V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_INTERLACED, @@ -120184,9 +120808,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7134/saa7134-video.c linu if (NULL != card_in(dev, n).name) { strcpy(t->name, "Television"); t->type = V4L2_TUNER_ANALOG_TV; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/Makefile linux-2.6.35.x86_64.new/drivers/media/video/saa7164/Makefile ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/Makefile 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7164/Makefile ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/Makefile @@ -1,6 +1,6 @@ saa7164-objs := saa7164-cards.o saa7164-core.o saa7164-i2c.o saa7164-dvb.o \ saa7164-fw.o saa7164-bus.o saa7164-cmd.o saa7164-api.o \ @@ -120195,9 +120820,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/Makefile linux-2.6.3 obj-$(CONFIG_VIDEO_SAA7164) += saa7164.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-api.c linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-api.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-api.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-api.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-api.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7164/saa7164-api.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-api.c @@ -1,7 +1,7 @@ /* * Driver for the NXP SAA7164 PCIe bridge @@ -121349,9 +121975,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-api.c linux- - - -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-buffer.c linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-buffer.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-buffer.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-buffer.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-buffer.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7164/saa7164-buffer.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-buffer.c @@ -1,7 +1,7 @@ /* * Driver for the NXP SAA7164 PCIe bridge @@ -121689,9 +122316,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-buffer.c lin + kfree(buf); +} + -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-bus.c linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-bus.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-bus.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-bus.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-bus.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7164/saa7164-bus.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-bus.c @@ -1,7 +1,7 @@ /* * Driver for the NXP SAA7164 PCIe bridge @@ -121974,9 +122602,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-bus.c linux- return ret; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-cards.c linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-cards.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-cards.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7164/saa7164-cards.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-cards.c @@ -1,7 +1,7 @@ /* * Driver for the NXP SAA7164 PCIe bridge @@ -122080,9 +122709,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-cards.c linu } static void hauppauge_eeprom(struct saa7164_dev *dev, u8 *eeprom_data) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-cmd.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-cmd.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-cmd.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-cmd.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7164/saa7164-cmd.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-cmd.c @@ -1,7 +1,7 @@ /* * Driver for the NXP SAA7164 PCIe bridge @@ -122183,9 +122813,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-cmd.c linux- u8 errdata[256]; u16 resp_dsize; u16 data_recd; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-core.c linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-core.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-core.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7164/saa7164-core.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-core.c @@ -1,7 +1,7 @@ /* * Driver for the NXP SAA7164 PCIe bridge @@ -123289,9 +123920,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-core.c linux pci_unregister_driver(&saa7164_pci_driver); } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-dvb.c linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-dvb.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-dvb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-dvb.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-dvb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7164/saa7164-dvb.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-dvb.c @@ -1,7 +1,7 @@ /* * Driver for the NXP SAA7164 PCIe bridge @@ -123530,9 +124162,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-dvb.c linux- /* register everything */ ret = dvb_register(port); if (ret < 0) { -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-encoder.c linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-encoder.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-encoder.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-encoder.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-encoder.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-encoder.c @@ -0,0 +1,1510 @@ +/* + * Driver for the NXP SAA7164 PCIe bridge @@ -125044,9 +125677,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-encoder.c li + dprintk(DBGLVL_ENC, "%s(port=%d) done\n", __func__, port->nr); +} + -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-fw.c linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-fw.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-fw.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-fw.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-fw.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7164/saa7164-fw.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-fw.c @@ -1,7 +1,7 @@ /* * Driver for the NXP SAA7164 PCIe bridge @@ -125116,9 +125750,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-fw.c linux-2 ret = 0; out: -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164.h linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164.h ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164.h 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7164/saa7164.h ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164.h @@ -1,7 +1,7 @@ /* * Driver for the NXP SAA7164 PCIe bridge @@ -125584,9 +126219,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164.h linux-2.6. #define saa7164_readb(reg) readl(dev->bmmio + (reg)) #define saa7164_writeb(reg, value) writel((value), dev->bmmio + (reg)) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-i2c.c linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-i2c.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-i2c.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7164/saa7164-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-i2c.c @@ -1,7 +1,7 @@ /* * Driver for the NXP SAA7164 PCIe bridge @@ -125614,9 +126250,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-i2c.c linux- return retval; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-reg.h linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-reg.h ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-reg.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-reg.h 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-reg.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7164/saa7164-reg.h ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-reg.h @@ -1,7 +1,7 @@ /* * Driver for the NXP SAA7164 PCIe bridge @@ -125699,9 +126336,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-reg.h linux- +/* Firmware Debugging */ +#define SET_DEBUG_LEVEL_CONTROL 0x0B +#define GET_DEBUG_DATA_CONTROL 0x0C -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-types.h linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-types.h ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-types.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-types.h 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-types.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7164/saa7164-types.h ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-types.h @@ -1,7 +1,7 @@ /* * Driver for the NXP SAA7164 PCIe bridge @@ -126135,9 +126773,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-types.h linu + u32 CPUClock; + u32 RAMSpeed; +} __attribute__((packed)); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-vbi.c linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-vbi.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-vbi.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7164/saa7164-vbi.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-vbi.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-vbi.c @@ -0,0 +1,1384 @@ +/* + * Driver for the NXP SAA7164 PCIe bridge @@ -127523,9 +128162,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7164/saa7164-vbi.c linux- + } + +} -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa717x.c linux-2.6.35.x86_64.new/drivers/media/video/saa717x.c ---- linux-2.6.35.x86_64/drivers/media/video/saa717x.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa717x.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa717x.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa717x.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa717x.c @@ -38,7 +38,7 @@ #include #include @@ -128019,9 +128659,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa717x.c linux-2.6.35.x86_6 + +module_init(init_saa717x); +module_exit(exit_saa717x); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7185.c linux-2.6.35.x86_64.new/drivers/media/video/saa7185.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7185.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7185.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7185.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7185.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7185.c @@ -30,11 +30,9 @@ #include #include @@ -128065,9 +128706,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7185.c linux-2.6.35.x86_6 + +module_init(init_saa7185); +module_exit(exit_saa7185); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7191.c linux-2.6.35.x86_64.new/drivers/media/video/saa7191.c ---- linux-2.6.35.x86_64/drivers/media/video/saa7191.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/saa7191.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/saa7191.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/saa7191.c ++++ linux-2.6.35.x86_64/drivers/media/video/saa7191.c @@ -23,7 +23,6 @@ #include #include @@ -128107,9 +128749,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/saa7191.c linux-2.6.35.x86_6 + +module_init(init_saa7191); +module_exit(exit_saa7191); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/se401.c linux-2.6.35.x86_64.new/drivers/media/video/se401.c ---- linux-2.6.35.x86_64/drivers/media/video/se401.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/se401.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/se401.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/se401.c ++++ linux-2.6.35.x86_64/drivers/media/video/se401.c @@ -31,7 +31,6 @@ static const char version[] = "0.24"; #include #include @@ -128139,9 +128782,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/se401.c linux-2.6.35.x86_64. return err; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/sh_mobile_ceu_camera.c linux-2.6.35.x86_64.new/drivers/media/video/sh_mobile_ceu_camera.c ---- linux-2.6.35.x86_64/drivers/media/video/sh_mobile_ceu_camera.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/sh_mobile_ceu_camera.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/sh_mobile_ceu_camera.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/sh_mobile_ceu_camera.c ++++ linux-2.6.35.x86_64/drivers/media/video/sh_mobile_ceu_camera.c @@ -245,7 +245,7 @@ static void free_buffer(struct videobuf_ if (in_interrupt()) BUG(); @@ -128534,9 +129178,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/sh_mobile_ceu_camera.c linux return platform_driver_register(&sh_mobile_ceu_driver); } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/sh_mobile_csi2.c linux-2.6.35.x86_64.new/drivers/media/video/sh_mobile_csi2.c ---- linux-2.6.35.x86_64/drivers/media/video/sh_mobile_csi2.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/sh_mobile_csi2.c 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/sh_mobile_csi2.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/sh_mobile_csi2.c @@ -0,0 +1,354 @@ +/* + * Driver for the SH-Mobile MIPI CSI-2 unit @@ -128892,9 +129537,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/sh_mobile_csi2.c linux-2.6.3 +MODULE_AUTHOR("Guennadi Liakhovetski "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:sh-mobile-csi2"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/sh_vou.c linux-2.6.35.x86_64.new/drivers/media/video/sh_vou.c ---- linux-2.6.35.x86_64/drivers/media/video/sh_vou.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/sh_vou.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/sh_vou.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/sh_vou.c ++++ linux-2.6.35.x86_64/drivers/media/video/sh_vou.c @@ -18,6 +18,7 @@ #include #include @@ -129110,9 +129756,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/sh_vou.c linux-2.6.35.x86_64 if (!subdev) { ret = -ENOMEM; goto ei2cnd; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/sn9c102/sn9c102_devtable.h linux-2.6.35.x86_64.new/drivers/media/video/sn9c102/sn9c102_devtable.h ---- linux-2.6.35.x86_64/drivers/media/video/sn9c102/sn9c102_devtable.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/sn9c102/sn9c102_devtable.h 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/sn9c102/sn9c102_devtable.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/sn9c102/sn9c102_devtable.h ++++ linux-2.6.35.x86_64/drivers/media/video/sn9c102/sn9c102_devtable.h @@ -116,10 +116,14 @@ static const struct usb_device_id sn9c10 { SN9C102_USB_DEVICE(0x0c45, 0x60fe, BRIDGE_SN9C105), }, /* SN9C120 */ @@ -129128,9 +129775,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/sn9c102/sn9c102_devtable.h l /* { SN9C102_USB_DEVICE(0x0c45, 0x6138, BRIDGE_SN9C120), }, MO8000 */ #if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE { SN9C102_USB_DEVICE(0x0c45, 0x613a, BRIDGE_SN9C120), }, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/sn9c102/sn9c102_pas202bcb.c linux-2.6.35.x86_64.new/drivers/media/video/sn9c102/sn9c102_pas202bcb.c ---- linux-2.6.35.x86_64/drivers/media/video/sn9c102/sn9c102_pas202bcb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/sn9c102/sn9c102_pas202bcb.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/sn9c102/sn9c102_pas202bcb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/sn9c102/sn9c102_pas202bcb.c ++++ linux-2.6.35.x86_64/drivers/media/video/sn9c102/sn9c102_pas202bcb.c @@ -4,7 +4,6 @@ * * * Copyright (C) 2004 by Carlos Eduardo Medaglia Dyonisio * @@ -129139,9 +129787,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/sn9c102/sn9c102_pas202bcb.c * * * Support for SN9C103, DAC Magnitude, exposure and green gain controls * * added by Luca Risolia * -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/soc_camera.c linux-2.6.35.x86_64.new/drivers/media/video/soc_camera.c ---- linux-2.6.35.x86_64/drivers/media/video/soc_camera.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/soc_camera.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/soc_camera.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/soc_camera.c ++++ linux-2.6.35.x86_64/drivers/media/video/soc_camera.c @@ -92,8 +92,7 @@ EXPORT_SYMBOL(soc_camera_apply_sensor_fl static int soc_camera_try_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f) @@ -129735,9 +130384,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/soc_camera.c linux-2.6.35.x8 mutex_lock(&list_lock); list_for_each_entry(ix, &hosts, list) { -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/soc_camera_platform.c linux-2.6.35.x86_64.new/drivers/media/video/soc_camera_platform.c ---- linux-2.6.35.x86_64/drivers/media/video/soc_camera_platform.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/soc_camera_platform.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/soc_camera_platform.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/soc_camera_platform.c ++++ linux-2.6.35.x86_64/drivers/media/video/soc_camera_platform.c @@ -56,8 +56,8 @@ soc_camera_platform_query_bus_param(stru return p->bus_param; } @@ -129804,9 +130454,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/soc_camera_platform.c linux- }; static struct v4l2_subdev_ops platform_subdev_ops = { -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/soc_mediabus.c linux-2.6.35.x86_64.new/drivers/media/video/soc_mediabus.c ---- linux-2.6.35.x86_64/drivers/media/video/soc_mediabus.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/soc_mediabus.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/soc_mediabus.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/soc_mediabus.c ++++ linux-2.6.35.x86_64/drivers/media/video/soc_mediabus.c @@ -18,28 +18,28 @@ #define MBUS_IDX(f) (V4L2_MBUS_FMT_ ## f - V4L2_MBUS_FMT_FIXED - 1) @@ -129840,9 +130491,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/soc_mediabus.c linux-2.6.35. .fourcc = V4L2_PIX_FMT_VYUY, .name = "VYUY", .bits_per_sample = 8, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/sr030pc30.c linux-2.6.35.x86_64.new/drivers/media/video/sr030pc30.c ---- linux-2.6.35.x86_64/drivers/media/video/sr030pc30.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/sr030pc30.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/sr030pc30.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/sr030pc30.c @@ -0,0 +1,894 @@ +/* + * Driver for SiliconFile SR030PC30 VGA (1/10-Inch) Image Sensor with ISP @@ -130738,9 +131390,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/sr030pc30.c linux-2.6.35.x86 +MODULE_DESCRIPTION("Siliconfile SR030PC30 camera driver"); +MODULE_AUTHOR("Sylwester Nawrocki "); +MODULE_LICENSE("GPL"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/stk-webcam.c linux-2.6.35.x86_64.new/drivers/media/video/stk-webcam.c ---- linux-2.6.35.x86_64/drivers/media/video/stk-webcam.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/stk-webcam.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/stk-webcam.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/stk-webcam.c ++++ linux-2.6.35.x86_64/drivers/media/video/stk-webcam.c @@ -27,7 +27,6 @@ #include #include @@ -130764,9 +131417,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/stk-webcam.c linux-2.6.35.x8 return 0; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tda7432.c linux-2.6.35.x86_64.new/drivers/media/video/tda7432.c ---- linux-2.6.35.x86_64/drivers/media/video/tda7432.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tda7432.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tda7432.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tda7432.c ++++ linux-2.6.35.x86_64/drivers/media/video/tda7432.c @@ -36,7 +36,6 @@ #include #include @@ -130806,9 +131460,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tda7432.c linux-2.6.35.x86_6 + +module_init(init_tda7432); +module_exit(exit_tda7432); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tda9840.c linux-2.6.35.x86_64.new/drivers/media/video/tda9840.c ---- linux-2.6.35.x86_64/drivers/media/video/tda9840.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tda9840.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tda9840.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tda9840.c ++++ linux-2.6.35.x86_64/drivers/media/video/tda9840.c @@ -32,7 +32,6 @@ #include #include @@ -130848,9 +131503,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tda9840.c linux-2.6.35.x86_6 + +module_init(init_tda9840); +module_exit(exit_tda9840); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tda9875.c linux-2.6.35.x86_64.new/drivers/media/video/tda9875.c ---- linux-2.6.35.x86_64/drivers/media/video/tda9875.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tda9875.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tda9875.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tda9875.c ++++ linux-2.6.35.x86_64/drivers/media/video/tda9875.c @@ -28,7 +28,6 @@ #include #include @@ -130890,9 +131546,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tda9875.c linux-2.6.35.x86_6 + +module_init(init_tda9875); +module_exit(exit_tda9875); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tea6415c.c linux-2.6.35.x86_64.new/drivers/media/video/tea6415c.c ---- linux-2.6.35.x86_64/drivers/media/video/tea6415c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tea6415c.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tea6415c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tea6415c.c ++++ linux-2.6.35.x86_64/drivers/media/video/tea6415c.c @@ -34,7 +34,6 @@ #include #include @@ -130941,9 +131598,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tea6415c.c linux-2.6.35.x86_ + +module_init(init_tea6415c); +module_exit(exit_tea6415c); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tea6420.c linux-2.6.35.x86_64.new/drivers/media/video/tea6420.c ---- linux-2.6.35.x86_64/drivers/media/video/tea6420.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tea6420.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tea6420.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tea6420.c ++++ linux-2.6.35.x86_64/drivers/media/video/tea6420.c @@ -34,7 +34,6 @@ #include #include @@ -130983,9 +131641,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tea6420.c linux-2.6.35.x86_6 + +module_init(init_tea6420); +module_exit(exit_tea6420); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/timblogiw.c linux-2.6.35.x86_64.new/drivers/media/video/timblogiw.c ---- linux-2.6.35.x86_64/drivers/media/video/timblogiw.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/timblogiw.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/timblogiw.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/timblogiw.c @@ -0,0 +1,894 @@ +/* + * timblogiw.c timberdale FPGA LogiWin Video In driver @@ -131881,9 +132540,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/timblogiw.c linux-2.6.35.x86 +MODULE_AUTHOR("Pelagicore AB "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:"DRIVER_NAME); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tlg2300/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/tlg2300/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/tlg2300/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tlg2300/Kconfig 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tlg2300/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tlg2300/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/tlg2300/Kconfig @@ -1,9 +1,9 @@ config VIDEO_TLG2300 tristate "Telegent TLG2300 USB video capture support" @@ -131896,9 +132556,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tlg2300/Kconfig linux-2.6.35 select VIDEOBUF_VMALLOC select SND_PCM select VIDEOBUF_DVB -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tlg2300/pd-main.c linux-2.6.35.x86_64.new/drivers/media/video/tlg2300/pd-main.c ---- linux-2.6.35.x86_64/drivers/media/video/tlg2300/pd-main.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tlg2300/pd-main.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tlg2300/pd-main.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tlg2300/pd-main.c ++++ linux-2.6.35.x86_64/drivers/media/video/tlg2300/pd-main.c @@ -36,7 +36,6 @@ #include #include @@ -131941,9 +132602,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tlg2300/pd-main.c linux-2.6. usb_set_intfdata(interface, NULL); kref_put(&pd->kref, poseidon_delete); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tlg2300/pd-video.c linux-2.6.35.x86_64.new/drivers/media/video/tlg2300/pd-video.c ---- linux-2.6.35.x86_64/drivers/media/video/tlg2300/pd-video.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tlg2300/pd-video.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tlg2300/pd-video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tlg2300/pd-video.c ++++ linux-2.6.35.x86_64/drivers/media/video/tlg2300/pd-video.c @@ -1434,7 +1434,7 @@ static int pd_video_open(struct file *fi V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_INTERLACED,/* video is interlacd */ @@ -131962,9 +132624,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tlg2300/pd-video.c linux-2.6 } else { /* maybe add FM support here */ log("other "); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tlv320aic23b.c linux-2.6.35.x86_64.new/drivers/media/video/tlv320aic23b.c ---- linux-2.6.35.x86_64/drivers/media/video/tlv320aic23b.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tlv320aic23b.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tlv320aic23b.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tlv320aic23b.c ++++ linux-2.6.35.x86_64/drivers/media/video/tlv320aic23b.c @@ -29,10 +29,8 @@ #include #include @@ -132007,9 +132670,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tlv320aic23b.c linux-2.6.35. + +module_init(init_tlv320aic23b); +module_exit(exit_tlv320aic23b); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tuner-core.c linux-2.6.35.x86_64.new/drivers/media/video/tuner-core.c ---- linux-2.6.35.x86_64/drivers/media/video/tuner-core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tuner-core.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tuner-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tuner-core.c ++++ linux-2.6.35.x86_64/drivers/media/video/tuner-core.c @@ -20,7 +20,6 @@ #include #include @@ -132080,9 +132744,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tuner-core.c linux-2.6.35.x8 /* * Overrides for Emacs so that we follow Linus's tabbing style. * --------------------------------------------------------------------------- -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tvaudio.c linux-2.6.35.x86_64.new/drivers/media/video/tvaudio.c ---- linux-2.6.35.x86_64/drivers/media/video/tvaudio.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tvaudio.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tvaudio.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tvaudio.c ++++ linux-2.6.35.x86_64/drivers/media/video/tvaudio.c @@ -35,7 +35,6 @@ #include #include @@ -132149,9 +132814,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tvaudio.c linux-2.6.35.x86_6 + +module_init(init_tvaudio); +module_exit(exit_tvaudio); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tvp514x.c linux-2.6.35.x86_64.new/drivers/media/video/tvp514x.c ---- linux-2.6.35.x86_64/drivers/media/video/tvp514x.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tvp514x.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tvp514x.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tvp514x.c ++++ linux-2.6.35.x86_64/drivers/media/video/tvp514x.c @@ -35,6 +35,7 @@ #include @@ -132265,9 +132931,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tvp514x.c linux-2.6.35.x86_6 .g_parm = tvp514x_g_parm, .s_parm = tvp514x_s_parm, .s_stream = tvp514x_s_stream, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tvp5150.c linux-2.6.35.x86_64.new/drivers/media/video/tvp5150.c ---- linux-2.6.35.x86_64/drivers/media/video/tvp5150.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tvp5150.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tvp5150.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tvp5150.c ++++ linux-2.6.35.x86_64/drivers/media/video/tvp5150.c @@ -11,7 +11,6 @@ #include #include @@ -132329,9 +132996,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tvp5150.c linux-2.6.35.x86_6 + +module_init(init_tvp5150); +module_exit(exit_tvp5150); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tvp7002.c linux-2.6.35.x86_64.new/drivers/media/video/tvp7002.c ---- linux-2.6.35.x86_64/drivers/media/video/tvp7002.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tvp7002.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tvp7002.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tvp7002.c ++++ linux-2.6.35.x86_64/drivers/media/video/tvp7002.c @@ -179,7 +179,7 @@ static const struct i2c_reg_value tvp700 /* Register parameters for 480P */ static const struct i2c_reg_value tvp7002_parms_480P[] = { @@ -132564,9 +133232,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tvp7002.c linux-2.6.35.x86_6 .current_preset = tvp7002_presets, .gain = 0, }; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tw9910.c linux-2.6.35.x86_64.new/drivers/media/video/tw9910.c ---- linux-2.6.35.x86_64/drivers/media/video/tw9910.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/tw9910.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/tw9910.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/tw9910.c ++++ linux-2.6.35.x86_64/drivers/media/video/tw9910.c @@ -469,7 +469,7 @@ tw9910_select_norm(struct soc_camera_dev */ static int tw9910_s_stream(struct v4l2_subdev *sd, int enable) @@ -132693,9 +133362,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/tw9910.c linux-2.6.35.x86_64 return 0; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/upd64031a.c linux-2.6.35.x86_64.new/drivers/media/video/upd64031a.c ---- linux-2.6.35.x86_64/drivers/media/video/upd64031a.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/upd64031a.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/upd64031a.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/upd64031a.c ++++ linux-2.6.35.x86_64/drivers/media/video/upd64031a.c @@ -28,7 +28,6 @@ #include #include @@ -132735,9 +133405,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/upd64031a.c linux-2.6.35.x86 + +module_init(init_upd64031a); +module_exit(exit_upd64031a); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/upd64083.c linux-2.6.35.x86_64.new/drivers/media/video/upd64083.c ---- linux-2.6.35.x86_64/drivers/media/video/upd64083.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/upd64083.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/upd64083.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/upd64083.c ++++ linux-2.6.35.x86_64/drivers/media/video/upd64083.c @@ -28,7 +28,6 @@ #include #include @@ -132777,9 +133448,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/upd64083.c linux-2.6.35.x86_ + +module_init(init_upd64083); +module_exit(exit_upd64083); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/usbvideo/Kconfig linux-2.6.35.x86_64.new/drivers/media/video/usbvideo/Kconfig ---- linux-2.6.35.x86_64/drivers/media/video/usbvideo/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/usbvideo/Kconfig 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/usbvideo/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/usbvideo/Kconfig ++++ linux-2.6.35.x86_64/drivers/media/video/usbvideo/Kconfig @@ -12,10 +12,13 @@ config USB_VICAM module will be called vicam. @@ -132827,17 +133499,19 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/usbvideo/Kconfig linux-2.6.3 - To compile this driver as a module, choose M here: the - module will be called quickcam_messenger. - -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/usbvideo/Makefile linux-2.6.35.x86_64.new/drivers/media/video/usbvideo/Makefile ---- linux-2.6.35.x86_64/drivers/media/video/usbvideo/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/usbvideo/Makefile 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/usbvideo/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/usbvideo/Makefile ++++ linux-2.6.35.x86_64/drivers/media/video/usbvideo/Makefile @@ -2,4 +2,3 @@ obj-$(CONFIG_VIDEO_USBVIDEO) += usbvi obj-$(CONFIG_USB_IBMCAM) += ibmcam.o ultracam.o obj-$(CONFIG_USB_KONICAWC) += konicawc.o obj-$(CONFIG_USB_VICAM) += vicam.o -obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += quickcam_messenger.o -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/usbvideo/usbvideo.c linux-2.6.35.x86_64.new/drivers/media/video/usbvideo/usbvideo.c ---- linux-2.6.35.x86_64/drivers/media/video/usbvideo/usbvideo.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/usbvideo/usbvideo.c 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/usbvideo/usbvideo.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/usbvideo/usbvideo.c ++++ linux-2.6.35.x86_64/drivers/media/video/usbvideo/usbvideo.c @@ -282,19 +282,15 @@ static void usbvideo_OverlayChar(struct }; unsigned short digit; @@ -132862,9 +133536,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/usbvideo/usbvideo.c linux-2. for (iy=0; iy < 5; iy++) { for (ix=0; ix < 3; ix++) { -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/usbvideo/vicam.c linux-2.6.35.x86_64.new/drivers/media/video/usbvideo/vicam.c ---- linux-2.6.35.x86_64/drivers/media/video/usbvideo/vicam.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/usbvideo/vicam.c 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/usbvideo/vicam.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/usbvideo/vicam.c ++++ linux-2.6.35.x86_64/drivers/media/video/usbvideo/vicam.c @@ -2,7 +2,7 @@ * USB ViCam WebCam driver * Copyright (c) 2002 Joe Burks (jburks@wavicle.org), @@ -132950,9 +133625,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/usbvideo/vicam.c linux-2.6.3 return 0; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision.h linux-2.6.35.x86_64.new/drivers/media/video/usbvision/usbvision.h ---- linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/usbvision/usbvision.h 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/usbvision/usbvision.h ++++ linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision.h @@ -363,6 +363,7 @@ struct usb_usbvision { /* i2c Declaration Section*/ @@ -132961,9 +133637,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision.h linux- struct urb *ctrlUrb; unsigned char ctrlUrbBuffer[8]; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision-i2c.c linux-2.6.35.x86_64.new/drivers/media/video/usbvision/usbvision-i2c.c ---- linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/usbvision/usbvision-i2c.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/usbvision/usbvision-i2c.c ++++ linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision-i2c.c @@ -211,6 +211,9 @@ int usbvision_i2c_register(struct usb_us 0x42 >> 1, 0x40 >> 1, /* SAA7114, SAA7115 and SAA7118 */ I2C_CLIENT_END }; @@ -133023,9 +133700,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision-i2c.c li PDEBUG(DBG_I2C,"i2c bus for %s unregistered", usbvision->i2c_adap.name); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision-video.c linux-2.6.35.x86_64.new/drivers/media/video/usbvision/usbvision-video.c ---- linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision-video.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/usbvision/usbvision-video.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision-video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/usbvision/usbvision-video.c ++++ linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision-video.c @@ -357,7 +357,7 @@ static int usbvision_v4l2_open(struct fi PDEBUG(DBG_IO, "open"); @@ -133069,9 +133747,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/usbvision/usbvision-video.c mutex_unlock(&usbvision->lock); usbvision_create_sysfs(usbvision->vdev); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_ctrl.c linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_ctrl.c ---- linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_ctrl.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_ctrl.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_ctrl.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/uvc/uvc_ctrl.c ++++ linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_ctrl.c @@ -1,8 +1,8 @@ /* * uvc_ctrl.c -- USB Video Class driver - Controls @@ -134154,9 +134833,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_ctrl.c linux-2.6.35. + } } - -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_driver.c linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_driver.c ---- linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_driver.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_driver.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_driver.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/uvc/uvc_driver.c ++++ linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_driver.c @@ -1,8 +1,8 @@ /* * uvc_driver.c -- USB Video Class driver @@ -134305,9 +134985,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_driver.c linux-2.6.3 result = usb_register(&uvc_driver.driver); if (result == 0) printk(KERN_INFO DRIVER_DESC " (" DRIVER_VERSION ")\n"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_isight.c linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_isight.c ---- linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_isight.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_isight.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_isight.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/uvc/uvc_isight.c ++++ linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_isight.c @@ -4,7 +4,7 @@ * Copyright (C) 2006-2007 * Ivan N. Zlatev @@ -134317,9 +134998,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_isight.c linux-2.6.3 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_queue.c linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_queue.c ---- linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_queue.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_queue.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_queue.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/uvc/uvc_queue.c ++++ linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_queue.c @@ -1,8 +1,8 @@ /* * uvc_queue.c -- USB Video Class driver - Buffers management @@ -134412,9 +135094,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_queue.c linux-2.6.35 wake_up(&buf->wait); return nextbuf; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_status.c linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_status.c ---- linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_status.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_status.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_status.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/uvc/uvc_status.c ++++ linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_status.c @@ -1,8 +1,8 @@ /* * uvc_status.c -- USB Video Class driver - Status endpoint @@ -134426,9 +135109,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_status.c linux-2.6.3 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_v4l2.c linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_v4l2.c ---- linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_v4l2.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_v4l2.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_v4l2.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/uvc/uvc_v4l2.c ++++ linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_v4l2.c @@ -1,8 +1,8 @@ /* * uvc_v4l2.c -- USB Video Class driver - V4L2 API @@ -134615,9 +135299,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_v4l2.c linux-2.6.35. struct uvc_streaming *stream = handle->stream; uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_poll\n"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_video.c linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_video.c ---- linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_video.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvc_video.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/uvc/uvc_video.c ++++ linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_video.c @@ -1,8 +1,8 @@ /* * uvc_video.c -- USB Video Class driver - Video handling @@ -134774,9 +135459,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvc_video.c linux-2.6.35 ret = uvc_queue_enable(&stream->queue, 1); if (ret < 0) return ret; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvcvideo.h linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvcvideo.h ---- linux-2.6.35.x86_64/drivers/media/video/uvc/uvcvideo.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/uvc/uvcvideo.h 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/uvc/uvcvideo.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/uvc/uvcvideo.h ++++ linux-2.6.35.x86_64/drivers/media/video/uvc/uvcvideo.h @@ -40,6 +40,15 @@ struct uvc_xu_control_info { __u32 flags; }; @@ -134987,9 +135673,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/uvc/uvcvideo.h linux-2.6.35. extern int uvc_ctrl_begin(struct uvc_video_chain *chain); extern int __uvc_ctrl_commit(struct uvc_video_chain *chain, int rollback); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l1-compat.c linux-2.6.35.x86_64.new/drivers/media/video/v4l1-compat.c ---- linux-2.6.35.x86_64/drivers/media/video/v4l1-compat.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/v4l1-compat.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/v4l1-compat.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/v4l1-compat.c ++++ linux-2.6.35.x86_64/drivers/media/video/v4l1-compat.c @@ -645,9 +645,16 @@ static noinline long v4l1_compat_get_pic goto done; } @@ -135010,9 +135697,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l1-compat.c linux-2.6.35.x pict->palette = pixelformat_to_palette( fmt->fmt.pix.pixelformat); done: -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-common.c linux-2.6.35.x86_64.new/drivers/media/video/v4l2-common.c ---- linux-2.6.35.x86_64/drivers/media/video/v4l2-common.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/v4l2-common.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/v4l2-common.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/v4l2-common.c ++++ linux-2.6.35.x86_64/drivers/media/video/v4l2-common.c @@ -62,6 +62,7 @@ #define __OLD_VIDIOC_ /* To allow fixing old calls*/ #include @@ -135582,9 +136270,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-common.c linux-2.6.35.x + return best; +} +EXPORT_SYMBOL_GPL(v4l2_find_nearest_format); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-compat-ioctl32.c linux-2.6.35.x86_64.new/drivers/media/video/v4l2-compat-ioctl32.c ---- linux-2.6.35.x86_64/drivers/media/video/v4l2-compat-ioctl32.c 2010-12-15 10:51:22.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/v4l2-compat-ioctl32.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/v4l2-compat-ioctl32.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/v4l2-compat-ioctl32.c ++++ linux-2.6.35.x86_64/drivers/media/video/v4l2-compat-ioctl32.c @@ -5,7 +5,7 @@ * Copyright (C) 1997-2000 Jakub Jelinek (jakub@redhat.com) * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) @@ -135615,9 +136304,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-compat-ioctl32.c linux- return ret; switch (cmd) { -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-ctrls.c linux-2.6.35.x86_64.new/drivers/media/video/v4l2-ctrls.c ---- linux-2.6.35.x86_64/drivers/media/video/v4l2-ctrls.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/v4l2-ctrls.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/v4l2-ctrls.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/v4l2-ctrls.c @@ -0,0 +1,1856 @@ +/* + V4L2 controls framework implementation. @@ -137475,9 +138165,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-ctrls.c linux-2.6.35.x8 + return set_ctrl(ctrl, &val); +} +EXPORT_SYMBOL(v4l2_ctrl_s_ctrl); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-dev.c linux-2.6.35.x86_64.new/drivers/media/video/v4l2-dev.c ---- linux-2.6.35.x86_64/drivers/media/video/v4l2-dev.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/v4l2-dev.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/v4l2-dev.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/v4l2-dev.c ++++ linux-2.6.35.x86_64/drivers/media/video/v4l2-dev.c @@ -80,7 +80,7 @@ static inline unsigned long *devnode_bit /* Any types not assigned to fixed minor ranges must be mapped to one single bitmap for the purposes of finding a free node number @@ -137792,9 +138483,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-dev.c linux-2.6.35.x86_ device_unregister(&vdev->dev); } EXPORT_SYMBOL(video_unregister_device); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-device.c linux-2.6.35.x86_64.new/drivers/media/video/v4l2-device.c ---- linux-2.6.35.x86_64/drivers/media/video/v4l2-device.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/v4l2-device.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/v4l2-device.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/v4l2-device.c ++++ linux-2.6.35.x86_64/drivers/media/video/v4l2-device.c @@ -26,6 +26,7 @@ #endif #include @@ -137823,9 +138515,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-device.c linux-2.6.35.x sd->v4l2_dev = v4l2_dev; spin_lock(&v4l2_dev->lock); list_add_tail(&sd->list, &v4l2_dev->subdevs); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-event.c linux-2.6.35.x86_64.new/drivers/media/video/v4l2-event.c ---- linux-2.6.35.x86_64/drivers/media/video/v4l2-event.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/v4l2-event.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/v4l2-event.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/v4l2-event.c ++++ linux-2.6.35.x86_64/drivers/media/video/v4l2-event.c @@ -134,15 +134,22 @@ int v4l2_event_dequeue(struct v4l2_fh *f if (nonblocking) return __v4l2_event_dequeue(fh, event); @@ -137850,9 +138543,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-event.c linux-2.6.35.x8 return ret; } EXPORT_SYMBOL_GPL(v4l2_event_dequeue); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-ioctl.c linux-2.6.35.x86_64.new/drivers/media/video/v4l2-ioctl.c ---- linux-2.6.35.x86_64/drivers/media/video/v4l2-ioctl.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/v4l2-ioctl.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/v4l2-ioctl.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/v4l2-ioctl.c ++++ linux-2.6.35.x86_64/drivers/media/video/v4l2-ioctl.c @@ -26,6 +26,7 @@ #endif #include @@ -137966,9 +138660,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-ioctl.c linux-2.6.35.x8 if (!ret) dbgarg(cmd, "id=0x%x, index=%d, name=%s\n", p->id, p->index, p->name); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-mem2mem.c linux-2.6.35.x86_64.new/drivers/media/video/v4l2-mem2mem.c ---- linux-2.6.35.x86_64/drivers/media/video/v4l2-mem2mem.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/v4l2-mem2mem.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/v4l2-mem2mem.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/v4l2-mem2mem.c ++++ linux-2.6.35.x86_64/drivers/media/video/v4l2-mem2mem.c @@ -421,8 +421,8 @@ unsigned int v4l2_m2m_poll(struct file * src_q = v4l2_m2m_get_src_vq(m2m_ctx); dst_q = v4l2_m2m_get_dst_vq(m2m_ctx); @@ -137991,9 +138686,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/v4l2-mem2mem.c linux-2.6.35. return rc; } EXPORT_SYMBOL_GPL(v4l2_m2m_poll); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/via-camera.c linux-2.6.35.x86_64.new/drivers/media/video/via-camera.c ---- linux-2.6.35.x86_64/drivers/media/video/via-camera.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/via-camera.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/via-camera.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/via-camera.c @@ -0,0 +1,1474 @@ +/* + * Driver for the VIA Chrome integrated camera controller. @@ -139469,9 +140165,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/via-camera.c linux-2.6.35.x8 + platform_driver_unregister(&viacam_driver); +} +module_exit(viacam_exit); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/via-camera.h linux-2.6.35.x86_64.new/drivers/media/video/via-camera.h ---- linux-2.6.35.x86_64/drivers/media/video/via-camera.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/media/video/via-camera.h 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/via-camera.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/media/video/via-camera.h @@ -0,0 +1,93 @@ +/* + * VIA Camera register definitions. @@ -139566,9 +140263,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/via-camera.h linux-2.6.35.x8 +#define VCR_TS2ERR 0x35c /* TS buffer 0 error indicator */ + +/* Add 0x1000 for the second capture engine registers */ -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/videobuf-core.c linux-2.6.35.x86_64.new/drivers/media/video/videobuf-core.c ---- linux-2.6.35.x86_64/drivers/media/video/videobuf-core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/videobuf-core.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/videobuf-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/videobuf-core.c ++++ linux-2.6.35.x86_64/drivers/media/video/videobuf-core.c @@ -52,18 +52,18 @@ MODULE_LICENSE("GPL"); #define CALL(q, f, arg...) \ ((q->int_ops->f) ? q->int_ops->f(arg) : 0) @@ -140074,9 +140772,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/videobuf-core.c linux-2.6.35 return rc; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/videobuf-dma-contig.c linux-2.6.35.x86_64.new/drivers/media/video/videobuf-dma-contig.c ---- linux-2.6.35.x86_64/drivers/media/video/videobuf-dma-contig.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/videobuf-dma-contig.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/videobuf-dma-contig.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/videobuf-dma-contig.c ++++ linux-2.6.35.x86_64/drivers/media/video/videobuf-dma-contig.c @@ -28,7 +28,6 @@ struct videobuf_dma_contig_memory { void *vaddr; dma_addr_t dma_handle; @@ -140182,9 +140881,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/videobuf-dma-contig.c linux- } EXPORT_SYMBOL_GPL(videobuf_dma_contig_free); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/videobuf-dma-sg.c linux-2.6.35.x86_64.new/drivers/media/video/videobuf-dma-sg.c ---- linux-2.6.35.x86_64/drivers/media/video/videobuf-dma-sg.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/videobuf-dma-sg.c 2010-12-15 11:52:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/videobuf-dma-sg.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/videobuf-dma-sg.c ++++ linux-2.6.35.x86_64/drivers/media/video/videobuf-dma-sg.c @@ -57,7 +57,13 @@ MODULE_LICENSE("GPL"); /* --------------------------------------------------------------------- */ @@ -140440,9 +141140,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/videobuf-dma-sg.c linux-2.6. } EXPORT_SYMBOL_GPL(videobuf_queue_sg_init); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/videobuf-dvb.c linux-2.6.35.x86_64.new/drivers/media/video/videobuf-dvb.c ---- linux-2.6.35.x86_64/drivers/media/video/videobuf-dvb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/videobuf-dvb.c 2010-12-15 11:13:24.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/videobuf-dvb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/videobuf-dvb.c ++++ linux-2.6.35.x86_64/drivers/media/video/videobuf-dvb.c @@ -57,7 +57,7 @@ static int videobuf_dvb_thread(void *dat buf = list_entry(dvb->dvbq.stream.next, struct videobuf_buffer, stream); @@ -140452,9 +141153,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/videobuf-dvb.c linux-2.6.35. /* no more feeds left or stop_feed() asked us to quit */ if (0 == dvb->nfeeds) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/videobuf-vmalloc.c linux-2.6.35.x86_64.new/drivers/media/video/videobuf-vmalloc.c ---- linux-2.6.35.x86_64/drivers/media/video/videobuf-vmalloc.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/videobuf-vmalloc.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/videobuf-vmalloc.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/videobuf-vmalloc.c ++++ linux-2.6.35.x86_64/drivers/media/video/videobuf-vmalloc.c @@ -75,7 +75,7 @@ static void videobuf_vm_close(struct vm_ struct videobuf_vmalloc_memory *mem; @@ -140598,9 +141300,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/videobuf-vmalloc.c linux-2.6 return; } -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/vino.c linux-2.6.35.x86_64.new/drivers/media/video/vino.c ---- linux-2.6.35.x86_64/drivers/media/video/vino.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/vino.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/vino.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/vino.c ++++ linux-2.6.35.x86_64/drivers/media/video/vino.c @@ -4334,10 +4334,10 @@ static int __init vino_module_init(void) vino_drvdata->decoder = @@ -140614,9 +141317,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/vino.c linux-2.6.35.x86_64.n dprintk("init complete!\n"); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/vivi.c linux-2.6.35.x86_64.new/drivers/media/video/vivi.c ---- linux-2.6.35.x86_64/drivers/media/video/vivi.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/vivi.c 2010-12-15 11:13:20.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/vivi.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/vivi.c ++++ linux-2.6.35.x86_64/drivers/media/video/vivi.c @@ -820,14 +820,11 @@ static int vidioc_s_fmt_vid_cap(struct f struct v4l2_format *f) { @@ -140682,9 +141386,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/vivi.c linux-2.6.35.x86_64.n ret = video_register_device(vfd, VFL_TYPE_GRABBER, video_nr); if (ret < 0) -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/vp27smpx.c linux-2.6.35.x86_64.new/drivers/media/video/vp27smpx.c ---- linux-2.6.35.x86_64/drivers/media/video/vp27smpx.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/vp27smpx.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/vp27smpx.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/vp27smpx.c ++++ linux-2.6.35.x86_64/drivers/media/video/vp27smpx.c @@ -27,11 +27,9 @@ #include #include @@ -140728,9 +141433,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/vp27smpx.c linux-2.6.35.x86_ + +module_init(init_vp27smpx); +module_exit(exit_vp27smpx); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/vpx3220.c linux-2.6.35.x86_64.new/drivers/media/video/vpx3220.c ---- linux-2.6.35.x86_64/drivers/media/video/vpx3220.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/vpx3220.c 2010-12-15 11:13:21.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/vpx3220.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/vpx3220.c ++++ linux-2.6.35.x86_64/drivers/media/video/vpx3220.c @@ -28,7 +28,6 @@ #include #include @@ -140770,9 +141476,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/vpx3220.c linux-2.6.35.x86_6 + +module_init(init_vpx3220); +module_exit(exit_vpx3220); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/wm8739.c linux-2.6.35.x86_64.new/drivers/media/video/wm8739.c ---- linux-2.6.35.x86_64/drivers/media/video/wm8739.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/wm8739.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/wm8739.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/wm8739.c ++++ linux-2.6.35.x86_64/drivers/media/video/wm8739.c @@ -27,11 +27,10 @@ #include #include @@ -141085,9 +141792,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/wm8739.c linux-2.6.35.x86_64 + +module_init(init_wm8739); +module_exit(exit_wm8739); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/wm8775.c linux-2.6.35.x86_64.new/drivers/media/video/wm8775.c ---- linux-2.6.35.x86_64/drivers/media/video/wm8775.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/wm8775.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/wm8775.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/wm8775.c ++++ linux-2.6.35.x86_64/drivers/media/video/wm8775.c @@ -31,11 +31,11 @@ #include #include @@ -141395,9 +142103,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/wm8775.c linux-2.6.35.x86_64 + +module_init(init_wm8775); +module_exit(exit_wm8775); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/videocodec.c linux-2.6.35.x86_64.new/drivers/media/video/zoran/videocodec.c ---- linux-2.6.35.x86_64/drivers/media/video/zoran/videocodec.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/zoran/videocodec.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/zoran/videocodec.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/zoran/videocodec.c ++++ linux-2.6.35.x86_64/drivers/media/video/zoran/videocodec.c @@ -107,15 +107,14 @@ videocodec_attach (struct videocodec_mas if (!try_module_get(h->codec->owner)) return NULL; @@ -141416,9 +142125,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/videocodec.c linux-2.6 snprintf(codec->name, sizeof(codec->name), "%s[%d]", codec->name, h->attached); -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/videocodec.h linux-2.6.35.x86_64.new/drivers/media/video/zoran/videocodec.h ---- linux-2.6.35.x86_64/drivers/media/video/zoran/videocodec.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/zoran/videocodec.h 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/zoran/videocodec.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/zoran/videocodec.h ++++ linux-2.6.35.x86_64/drivers/media/video/zoran/videocodec.h @@ -56,7 +56,7 @@ the slave is bound to it). Otherwise it doesn't need this functions and therfor they may not be initialized. @@ -141428,9 +142138,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/videocodec.h linux-2.6 most/all of the codecs. The last ones may be ommited, too. See the structure declaration below for more information and which data has -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_card.c linux-2.6.35.x86_64.new/drivers/media/video/zoran/zoran_card.c ---- linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_card.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/zoran/zoran_card.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_card.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/zoran/zoran_card.c ++++ linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_card.c @@ -379,7 +379,6 @@ static struct card_info zoran_cards[NUM_ .type = DC10_old, .name = "DC10(old)", @@ -141552,9 +142263,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_card.c linux-2.6 0, zr->card.addrs_encoder); dprintk(2, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_device.c linux-2.6.35.x86_64.new/drivers/media/video/zoran/zoran_device.c ---- linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_device.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/zoran/zoran_device.c 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_device.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/zoran/zoran_device.c ++++ linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_device.c @@ -484,7 +484,7 @@ zr36057_overlay (struct zoran *zr, zr->overlay_settings.format); @@ -141590,9 +142302,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_device.c linux-2 printk(KERN_INFO "%s: stat_com=%s queue_state=%ld/%ld/%ld/%ld\n", ZR_DEVNAME(zr), sv, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_driver.c linux-2.6.35.x86_64.new/drivers/media/video/zoran/zoran_driver.c ---- linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_driver.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/zoran/zoran_driver.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_driver.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/zoran/zoran_driver.c ++++ linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_driver.c @@ -49,7 +49,6 @@ #include #include @@ -141690,9 +142403,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/zoran_driver.c linux-2 .read = zoran_read, .write = zoran_write, .mmap = zoran_mmap, -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/zoran.h linux-2.6.35.x86_64.new/drivers/media/video/zoran/zoran.h ---- linux-2.6.35.x86_64/drivers/media/video/zoran/zoran.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/zoran/zoran.h 2010-12-15 11:13:23.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/zoran/zoran.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/zoran/zoran.h ++++ linux-2.6.35.x86_64/drivers/media/video/zoran/zoran.h @@ -341,10 +341,8 @@ struct card_info { enum card_type type; char name[32]; @@ -141715,9 +142429,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/zoran.h linux-2.6.35.x int user; /* number of current users */ struct card_info card; struct tvnorm *timing; -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/zr36050.c linux-2.6.35.x86_64.new/drivers/media/video/zoran/zr36050.c ---- linux-2.6.35.x86_64/drivers/media/video/zoran/zr36050.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/zoran/zr36050.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/zoran/zr36050.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/zoran/zr36050.c ++++ linux-2.6.35.x86_64/drivers/media/video/zoran/zr36050.c @@ -236,7 +236,7 @@ zr36050_pushit (struct zr36050 *ptr, Could be variable, but until it's not needed it they are just fixed to save @@ -141727,9 +142442,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/zr36050.c linux-2.6.35 ========================================================================= */ static const char zr36050_dqt[0x86] = { -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/zr36060.c linux-2.6.35.x86_64.new/drivers/media/video/zoran/zr36060.c ---- linux-2.6.35.x86_64/drivers/media/video/zoran/zr36060.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/zoran/zr36060.c 2010-12-15 11:13:22.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/zoran/zr36060.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/zoran/zr36060.c ++++ linux-2.6.35.x86_64/drivers/media/video/zoran/zr36060.c @@ -227,7 +227,7 @@ zr36060_pushit (struct zr36060 *ptr, Could be variable, but until it's not needed it they are just fixed to save @@ -141739,9 +142455,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zoran/zr36060.c linux-2.6.35 ========================================================================= */ static const char zr36060_dqt[0x86] = { -diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zr364xx.c linux-2.6.35.x86_64.new/drivers/media/video/zr364xx.c ---- linux-2.6.35.x86_64/drivers/media/video/zr364xx.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/media/video/zr364xx.c 2010-12-15 11:13:25.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/media/video/zr364xx.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/media/video/zr364xx.c ++++ linux-2.6.35.x86_64/drivers/media/video/zr364xx.c @@ -572,7 +572,7 @@ static int zr364xx_got_frame(struct zr36 DBG("wakeup [buf/i] [%p/%d]\n", buf, buf->vb.i); unlock: @@ -141760,9 +142477,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/media/video/zr364xx.c linux-2.6.35.x86_6 /* Added some delay here, since opening/closing the camera quickly, * like Ekiga does during its startup, can crash the webcam -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-alsa.c linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-alsa.c ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-alsa.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-alsa.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-alsa.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-alsa.c ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-alsa.c @@ -20,6 +20,8 @@ * */ @@ -142056,9 +142774,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-alsa.c linux-2.6 return 0; -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio.h linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-audio.h ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-audio.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-audio.h ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio.h @@ -27,24 +27,25 @@ #define LINES_PER_BUFFER 15 #define AUDIO_LINE_SIZE 128 @@ -142102,9 +142821,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio.h linux-2. +(MAX_BUFFER_PROGRAM_SIZE * NUMBER_OF_PROGRAMS + RISC_SYNC_INSTRUCTION_SIZE) #endif -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio-upstream.c linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-audio-upstream.c ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio-upstream.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-audio-upstream.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio-upstream.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-audio-upstream.c ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio-upstream.c @@ -20,6 +20,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -142386,9 +143106,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio-upstream.c dev->name); goto error; } -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio-upstream.h linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-audio-upstream.h ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio-upstream.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-audio-upstream.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio-upstream.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-audio-upstream.h ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio-upstream.h @@ -46,11 +46,11 @@ #define USE_RISC_NOOP_AUDIO 1 @@ -142403,9 +143124,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-audio-upstream.h #endif static int _line_size; -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-cards.c linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-cards.c ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-cards.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-cards.c ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-cards.c @@ -21,6 +21,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -142415,9 +143137,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-cards.c linux-2. #include #include #include -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-core.c linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-core.c ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-core.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-core.c ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-core.c @@ -21,6 +21,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -143010,9 +143733,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-core.c linux-2.6 return pci_register_driver(&cx25821_pci_driver); } -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821.h linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821.h ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821.h ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821.h @@ -61,7 +61,7 @@ #define FALSE 0 #define LINE_SIZE_D1 1440 @@ -143188,9 +143912,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821.h linux-2.6.35.x extern int cx25821_i2c_register(struct cx25821_i2c *bus); extern void cx25821_card_setup(struct cx25821_dev *dev); -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-i2c.c linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-i2c.c ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-i2c.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-i2c.c ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-i2c.c @@ -21,6 +21,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -143262,9 +143987,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-i2c.c linux-2.6. }; static struct i2c_adapter cx25821_i2c_adap_template = { -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-defines.h linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-medusa-defines.h ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-defines.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-medusa-defines.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-defines.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-medusa-defines.h ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-defines.h @@ -23,7 +23,7 @@ #ifndef _MEDUSA_DEF_H_ #define _MEDUSA_DEF_H_ @@ -143296,9 +144022,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-defines.h #define MAX_REGISTRY_SZ 40; #endif -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-reg.h linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-medusa-reg.h ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-reg.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-medusa-reg.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-reg.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-medusa-reg.h ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-reg.h @@ -23,11 +23,11 @@ #ifndef __MEDUSA_REGISTERS__ #define __MEDUSA_REGISTERS__ @@ -143429,9 +144156,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-reg.h lin +#define VDEC_A_HUE_CTRL 0x101A #endif -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-video.c linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-medusa-video.c ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-video.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-medusa-video.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-medusa-video.c ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-video.c @@ -20,6 +20,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -143519,9 +144247,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-video.c l return ret_val; error: -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-video.h linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-medusa-video.h ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-video.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-medusa-video.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-video.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-medusa-video.h ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-video.h @@ -25,7 +25,7 @@ #include "cx25821-medusa-defines.h" @@ -143540,9 +144269,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-medusa-video.h l #define SHARPNESS_DEFAULT 50 #define SATURATION_DEFAULT 5000 #define BRIGHTNESS_DEFAULT 6200 -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-reg.h linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-reg.h ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-reg.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-reg.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-reg.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-reg.h ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-reg.h @@ -48,24 +48,24 @@ #define RISC_SYNC_EVEN_VBI 0x00000207 #define RISC_NOOP 0xF0000000 @@ -145893,9 +146623,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-reg.h linux-2.6. -#endif //Athena_REGISTERS +#endif /* Athena_REGISTERS */ -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-sram.h linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-sram.h ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-sram.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-sram.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-sram.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-sram.h ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-sram.h @@ -23,34 +23,34 @@ #ifndef __ATHENA_SRAM_H__ #define __ATHENA_SRAM_H__ @@ -145984,9 +146715,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-sram.h linux-2.6 #define TX_SRAM_POOL_START 0x00000 #define VID_A_DOWN_CLUSTER_1 0x00040 -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video.c linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-video.c ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-video.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-video.c ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video.c @@ -4,6 +4,9 @@ * Copyright (C) 2009 Conexant Systems Inc. * Authors , @@ -147239,9 +147971,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video.c linux-2. + .tvnorms = CX25821_NORMS, + .current_norm = V4L2_STD_NTSC_M, +}; -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video.h linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-video.h ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-video.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-video.h ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video.h @@ -49,12 +49,13 @@ #define VIDEO_DEBUG 0 @@ -147301,9 +148034,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video.h linux-2. extern int cx25821_get_format_size(void); extern int cx25821_buffer_setup(struct videobuf_queue *q, unsigned int *count, -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream.c linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-video-upstream.c ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-video-upstream.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-video-upstream.c ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream.c @@ -20,6 +20,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -147556,9 +148290,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream.c dev->name); goto error; } -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream-ch2.c linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-video-upstream-ch2.c ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream-ch2.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-video-upstream-ch2.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream-ch2.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-video-upstream-ch2.c ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream-ch2.c @@ -20,6 +20,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -148107,9 +148842,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream-c cx25821_dev_unregister(dev); return err; -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream-ch2.h linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-video-upstream-ch2.h ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream-ch2.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-video-upstream-ch2.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream-ch2.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-video-upstream-ch2.h ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream-ch2.h @@ -37,7 +37,7 @@ #define RESET_STATUS -1 #define NUM_NO_OPS 5 @@ -148141,9 +148877,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream-c - RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE ) + RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE) #endif -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream.h linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-video-upstream.h ---- linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/cx25821-video-upstream.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/cx25821-video-upstream.h ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream.h @@ -38,7 +38,7 @@ #define RESET_STATUS -1 #define NUM_NO_OPS 5 @@ -148172,9 +148909,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/cx25821-video-upstream.h - RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE ) + RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE) #endif -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/Kconfig linux-2.6.35.x86_64.new/drivers/staging/cx25821/Kconfig ---- linux-2.6.35.x86_64/drivers/staging/cx25821/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/Kconfig 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/Kconfig ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/Kconfig @@ -1,10 +1,11 @@ config VIDEO_CX25821 tristate "Conexant cx25821 support" @@ -148189,9 +148927,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/Kconfig linux-2.6.35.x86 select VIDEOBUF_DVB select VIDEOBUF_DMA_SG select VIDEO_CX25840 -diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/Makefile linux-2.6.35.x86_64.new/drivers/staging/cx25821/Makefile ---- linux-2.6.35.x86_64/drivers/staging/cx25821/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/cx25821/Makefile 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/cx25821/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/cx25821/Makefile ++++ linux-2.6.35.x86_64/drivers/staging/cx25821/Makefile @@ -1,14 +1,13 @@ -cx25821-objs := cx25821-core.o cx25821-cards.o cx25821-i2c.o cx25821-gpio.o \ - cx25821-medusa-video.o cx25821-video.o cx25821-video0.o cx25821-video1.o \ @@ -148216,9 +148955,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/cx25821/Makefile linux-2.6.35.x8 +ccflags-y += -Idrivers/media/common/tuners +ccflags-y += -Idrivers/media/dvb/dvb-core +ccflags-y += -Idrivers/media/dvb/frontends -diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/go7007-driver.c linux-2.6.35.x86_64.new/drivers/staging/go7007/go7007-driver.c ---- linux-2.6.35.x86_64/drivers/staging/go7007/go7007-driver.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/go7007/go7007-driver.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/go7007/go7007-driver.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/go7007/go7007-driver.c ++++ linux-2.6.35.x86_64/drivers/staging/go7007/go7007-driver.c @@ -194,51 +194,15 @@ int go7007_reset_encoder(struct go7007 * * Attempt to instantiate an I2C client by ID, probably loading a module. */ @@ -148308,9 +149048,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/go7007-driver.c linux-2.6 /* If this is the start of a new MPEG frame, * get a new buffer */ if ((go->format == GO7007_FORMAT_MPEG1 || -diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/go7007-usb.c linux-2.6.35.x86_64.new/drivers/staging/go7007/go7007-usb.c ---- linux-2.6.35.x86_64/drivers/staging/go7007/go7007-usb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/go7007/go7007-usb.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/go7007/go7007-usb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/go7007/go7007-usb.c ++++ linux-2.6.35.x86_64/drivers/staging/go7007/go7007-usb.c @@ -394,7 +394,7 @@ static struct go7007_usb_board board_adl .num_i2c_devs = 1, .i2c_devs = { @@ -148320,9 +149061,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/go7007-usb.c linux-2.6.35 .id = I2C_DRIVERID_WIS_TW2804, .addr = 0x00, /* yes, really */ }, -diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/go7007-v4l2.c linux-2.6.35.x86_64.new/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.35.x86_64/drivers/staging/go7007/go7007-v4l2.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/go7007/go7007-v4l2.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/go7007/go7007-v4l2.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/go7007/go7007-v4l2.c ++++ linux-2.6.35.x86_64/drivers/staging/go7007/go7007-v4l2.c @@ -252,23 +252,22 @@ static int set_capture_size(struct go700 go->modet_map[i] = 0; @@ -148356,9 +149098,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/go7007-v4l2.c linux-2.6.3 } else { if (width <= sensor_width / 4) { go->encoder_h_halve = 1; -diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/Kconfig linux-2.6.35.x86_64.new/drivers/staging/go7007/Kconfig ---- linux-2.6.35.x86_64/drivers/staging/go7007/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/go7007/Kconfig 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/go7007/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/go7007/Kconfig ++++ linux-2.6.35.x86_64/drivers/staging/go7007/Kconfig @@ -1,9 +1,10 @@ config VIDEO_GO7007 tristate "WIS GO7007 MPEG encoder support" @@ -148372,9 +149115,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/Kconfig linux-2.6.35.x86_ select VIDEO_TUNER select VIDEO_TVEEPROM select SND_PCM -diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/Makefile linux-2.6.35.x86_64.new/drivers/staging/go7007/Makefile ---- linux-2.6.35.x86_64/drivers/staging/go7007/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/go7007/Makefile 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/go7007/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/go7007/Makefile ++++ linux-2.6.35.x86_64/drivers/staging/go7007/Makefile @@ -14,10 +14,10 @@ obj-$(CONFIG_VIDEO_GO7007_UDA1342) += wi obj-$(CONFIG_VIDEO_GO7007_SONY_TUNER) += wis-sony-tuner.o obj-$(CONFIG_VIDEO_GO7007_TW2804) += wis-tw2804.o @@ -148400,9 +149144,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/Makefile linux-2.6.35.x86 -EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core +ccflags-y += -Idrivers/media/dvb/frontends +ccflags-y += -Idrivers/media/dvb/dvb-core -diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/s2250-board.c linux-2.6.35.x86_64.new/drivers/staging/go7007/s2250-board.c ---- linux-2.6.35.x86_64/drivers/staging/go7007/s2250-board.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/go7007/s2250-board.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/go7007/s2250-board.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/go7007/s2250-board.c ++++ linux-2.6.35.x86_64/drivers/staging/go7007/s2250-board.c @@ -23,7 +23,6 @@ #include #include @@ -148467,9 +149212,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/s2250-board.c linux-2.6.3 + +module_init(init_s2250); +module_exit(exit_s2250); -diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-ov7640.c linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-ov7640.c ---- linux-2.6.35.x86_64/drivers/staging/go7007/wis-ov7640.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-ov7640.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/go7007/wis-ov7640.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/go7007/wis-ov7640.c ++++ linux-2.6.35.x86_64/drivers/staging/go7007/wis-ov7640.c @@ -81,6 +81,7 @@ static const struct i2c_device_id wis_ov { "wis_ov7640", 0 }, { } @@ -148478,9 +149224,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-ov7640.c linux-2.6.35 static struct i2c_driver wis_ov7640_driver = { .driver = { -diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-saa7113.c linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-saa7113.c ---- linux-2.6.35.x86_64/drivers/staging/go7007/wis-saa7113.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-saa7113.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/go7007/wis-saa7113.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/go7007/wis-saa7113.c ++++ linux-2.6.35.x86_64/drivers/staging/go7007/wis-saa7113.c @@ -308,6 +308,7 @@ static const struct i2c_device_id wis_sa { "wis_saa7113", 0 }, { } @@ -148489,9 +149236,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-saa7113.c linux-2.6.3 static struct i2c_driver wis_saa7113_driver = { .driver = { -diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-saa7115.c linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-saa7115.c ---- linux-2.6.35.x86_64/drivers/staging/go7007/wis-saa7115.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-saa7115.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/go7007/wis-saa7115.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/go7007/wis-saa7115.c ++++ linux-2.6.35.x86_64/drivers/staging/go7007/wis-saa7115.c @@ -441,6 +441,7 @@ static const struct i2c_device_id wis_sa { "wis_saa7115", 0 }, { } @@ -148500,9 +149248,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-saa7115.c linux-2.6.3 static struct i2c_driver wis_saa7115_driver = { .driver = { -diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-sony-tuner.c linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-sony-tuner.c ---- linux-2.6.35.x86_64/drivers/staging/go7007/wis-sony-tuner.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-sony-tuner.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/go7007/wis-sony-tuner.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/go7007/wis-sony-tuner.c ++++ linux-2.6.35.x86_64/drivers/staging/go7007/wis-sony-tuner.c @@ -692,6 +692,7 @@ static const struct i2c_device_id wis_so { "wis_sony_tuner", 0 }, { } @@ -148511,9 +149260,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-sony-tuner.c linux-2. static struct i2c_driver wis_sony_tuner_driver = { .driver = { -diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-tw2804.c linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-tw2804.c ---- linux-2.6.35.x86_64/drivers/staging/go7007/wis-tw2804.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-tw2804.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/go7007/wis-tw2804.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/go7007/wis-tw2804.c ++++ linux-2.6.35.x86_64/drivers/staging/go7007/wis-tw2804.c @@ -331,6 +331,7 @@ static const struct i2c_device_id wis_tw { "wis_tw2804", 0 }, { } @@ -148522,9 +149272,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-tw2804.c linux-2.6.35 static struct i2c_driver wis_tw2804_driver = { .driver = { -diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-tw9903.c linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-tw9903.c ---- linux-2.6.35.x86_64/drivers/staging/go7007/wis-tw9903.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-tw9903.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/go7007/wis-tw9903.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/go7007/wis-tw9903.c ++++ linux-2.6.35.x86_64/drivers/staging/go7007/wis-tw9903.c @@ -313,6 +313,7 @@ static const struct i2c_device_id wis_tw { "wis_tw9903", 0 }, { } @@ -148533,9 +149284,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-tw9903.c linux-2.6.35 static struct i2c_driver wis_tw9903_driver = { .driver = { -diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-uda1342.c linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-uda1342.c ---- linux-2.6.35.x86_64/drivers/staging/go7007/wis-uda1342.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/go7007/wis-uda1342.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/go7007/wis-uda1342.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/go7007/wis-uda1342.c ++++ linux-2.6.35.x86_64/drivers/staging/go7007/wis-uda1342.c @@ -86,6 +86,7 @@ static const struct i2c_device_id wis_ud { "wis_uda1342", 0 }, { } @@ -148544,9 +149296,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/go7007/wis-uda1342.c linux-2.6.3 static struct i2c_driver wis_uda1342_driver = { .driver = { -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/Kconfig linux-2.6.35.x86_64.new/drivers/staging/lirc/Kconfig ---- linux-2.6.35.x86_64/drivers/staging/lirc/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/Kconfig 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/Kconfig +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/Kconfig @@ -0,0 +1,97 @@ +# +# LIRC driver(s) configuration @@ -148645,9 +149398,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/Kconfig linux-2.6.35.x86_64 + Driver for the Zilog/Hauppauge IR Transmitter, found on + PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards +endif -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_bt829.c linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_bt829.c ---- linux-2.6.35.x86_64/drivers/staging/lirc/lirc_bt829.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_bt829.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/lirc_bt829.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/lirc_bt829.c @@ -0,0 +1,383 @@ +/* + * Remote control driver for the TV-card based on bt829 @@ -149032,9 +149786,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_bt829.c linux-2.6.35.x + +module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug enabled or not"); -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ene0100.h linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_ene0100.h ---- linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ene0100.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_ene0100.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ene0100.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ene0100.h @@ -0,0 +1,169 @@ +/* + * driver for ENE KB3926 B/C/D CIR (also known as ENE0100) @@ -149205,9 +149960,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ene0100.h linux-2.6.35 + + struct timeval gap_start; +}; -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_i2c.c linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_i2c.c ---- linux-2.6.35.x86_64/drivers/staging/lirc/lirc_i2c.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_i2c.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/lirc_i2c.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/lirc_i2c.c @@ -0,0 +1,536 @@ +/* + * lirc_i2c.c @@ -149745,9 +150501,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_i2c.c linux-2.6.35.x86 + +module_init(lirc_i2c_init); +module_exit(lirc_i2c_exit); -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_igorplugusb.c linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_igorplugusb.c ---- linux-2.6.35.x86_64/drivers/staging/lirc/lirc_igorplugusb.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_igorplugusb.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/lirc_igorplugusb.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/lirc_igorplugusb.c @@ -0,0 +1,577 @@ +/* + * lirc_igorplugusb - USB remote support for LIRC @@ -150326,9 +151083,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_igorplugusb.c linux-2. + +module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug enabled or not"); -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_imon.c linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_imon.c ---- linux-2.6.35.x86_64/drivers/staging/lirc/lirc_imon.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_imon.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/lirc_imon.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/lirc_imon.c @@ -0,0 +1,1056 @@ +/* + * lirc_imon.c: LIRC/VFD/LCD driver for SoundGraph iMON IR/VFD/LCD @@ -151386,9 +152144,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_imon.c linux-2.6.35.x8 + +module_init(imon_init); +module_exit(imon_exit); -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_it87.c linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_it87.c ---- linux-2.6.35.x86_64/drivers/staging/lirc/lirc_it87.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_it87.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/lirc_it87.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/lirc_it87.c @@ -0,0 +1,1025 @@ +/* + * LIRC driver for ITE IT8712/IT8705 CIR port @@ -152415,9 +153174,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_it87.c linux-2.6.35.x8 +MODULE_PARM_DESC(it87_freq, + "Carrier demodulator frequency (kHz), (default: 38)"); +#endif -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_it87.h linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_it87.h ---- linux-2.6.35.x86_64/drivers/staging/lirc/lirc_it87.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_it87.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/lirc_it87.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/lirc_it87.h @@ -0,0 +1,116 @@ +/* lirc_it87.h */ +/* SECTION: Definitions */ @@ -152535,9 +153295,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_it87.h linux-2.6.35.x8 +#define TIME_CONST (IT87_CIR_BAUDRATE_DIVISOR * 8000000ul / 115200ul) + +/********************************* ITE IT87xx ************************/ -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ite8709.c linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_ite8709.c ---- linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ite8709.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_ite8709.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ite8709.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ite8709.c @@ -0,0 +1,542 @@ +/* + * LIRC driver for ITE8709 CIR port @@ -153081,9 +153842,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ite8709.c linux-2.6.35 + +module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_parallel.c linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_parallel.c ---- linux-2.6.35.x86_64/drivers/staging/lirc/lirc_parallel.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_parallel.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/lirc_parallel.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/lirc_parallel.c @@ -0,0 +1,681 @@ +/* + * lirc_parallel.c @@ -153766,9 +154528,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_parallel.c linux-2.6.3 + +module_param(check_pselecd, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Check for printer (default: 0)"); -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_parallel.h linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_parallel.h ---- linux-2.6.35.x86_64/drivers/staging/lirc/lirc_parallel.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_parallel.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/lirc_parallel.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/lirc_parallel.h @@ -0,0 +1,26 @@ +/* lirc_parallel.h */ + @@ -153796,9 +154559,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_parallel.h linux-2.6.3 +#define LIRC_PARALLEL_TRANSMITTER_MASK ((1< @@ -157345,9 +158111,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_sir.c linux-2.6.35.x86 + +module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ttusbir.c linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_ttusbir.c ---- linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ttusbir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_ttusbir.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ttusbir.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ttusbir.c @@ -0,0 +1,396 @@ +/* + * lirc_ttusbir.c @@ -157745,9 +158512,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_ttusbir.c linux-2.6.35 + +module_init(ttusbir_init_module); +module_exit(ttusbir_exit_module); -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_zilog.c linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_zilog.c ---- linux-2.6.35.x86_64/drivers/staging/lirc/lirc_zilog.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/lirc_zilog.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/lirc_zilog.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/lirc_zilog.c @@ -0,0 +1,1390 @@ +/* + * i2c IR lirc driver for devices with zilog IR processors @@ -159139,9 +159907,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/lirc_zilog.c linux-2.6.35.x + +module_param(disable_tx, bool, 0644); +MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device"); -diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/Makefile linux-2.6.35.x86_64.new/drivers/staging/lirc/Makefile ---- linux-2.6.35.x86_64/drivers/staging/lirc/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/lirc/Makefile 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/lirc/Makefile +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/lirc/Makefile @@ -0,0 +1,17 @@ +# Makefile for the lirc drivers. +# @@ -159160,9 +159929,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/lirc/Makefile linux-2.6.35.x86_6 +obj-$(CONFIG_LIRC_SIR) += lirc_sir.o +obj-$(CONFIG_LIRC_TTUSBIR) += lirc_ttusbir.o +obj-$(CONFIG_LIRC_ZILOG) += lirc_zilog.o -diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/Kconfig linux-2.6.35.x86_64.new/drivers/staging/tm6000/Kconfig ---- linux-2.6.35.x86_64/drivers/staging/tm6000/Kconfig 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/tm6000/Kconfig 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/tm6000/Kconfig +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/tm6000/Kconfig ++++ linux-2.6.35.x86_64/drivers/staging/tm6000/Kconfig @@ -1,6 +1,6 @@ config VIDEO_TM6000 tristate "TV Master TM5600/6000/6010 driver" @@ -159182,9 +159952,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/Kconfig linux-2.6.35.x86_ select DVB_ZL10353 ---help--- This adds support for DVB cards based on the tm5600/tm6000 chip. -diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/Makefile linux-2.6.35.x86_64.new/drivers/staging/tm6000/Makefile ---- linux-2.6.35.x86_64/drivers/staging/tm6000/Makefile 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/tm6000/Makefile 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/tm6000/Makefile +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/tm6000/Makefile ++++ linux-2.6.35.x86_64/drivers/staging/tm6000/Makefile @@ -1,17 +1,15 @@ -tm6000-objs := tm6000-cards.o \ +tm6000-y := tm6000-cards.o \ @@ -159211,9 +159982,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/Makefile linux-2.6.35.x86 +ccflags-y += -Idrivers/media/common/tuners +ccflags-y += -Idrivers/media/dvb/dvb-core +ccflags-y += -Idrivers/media/dvb/frontends -diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-alsa.c linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-alsa.c ---- linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-alsa.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-alsa.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-alsa.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/tm6000/tm6000-alsa.c ++++ linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-alsa.c @@ -16,6 +16,7 @@ #include #include @@ -159727,9 +160499,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-alsa.c linux-2.6.3 }; static int __init tm6000_alsa_register(void) -diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-cards.c linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-cards.c ---- linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-cards.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-cards.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-cards.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/tm6000/tm6000-cards.c ++++ linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-cards.c @@ -1,20 +1,20 @@ /* - tm6000-cards.c - driver for TM5600/TM6000/TM6010 USB video capture devices @@ -159968,9 +160741,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-cards.c linux-2.6. kfree(dev); } -diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-core.c linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-core.c ---- linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-core.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-core.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-core.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/tm6000/tm6000-core.c ++++ linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-core.c @@ -1,23 +1,23 @@ /* - tm6000-core.c - driver for TM5600/TM6000/TM6010 USB video capture devices @@ -160567,9 +161341,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-core.c linux-2.6.3 - mutex_unlock(&tm6000_extension_devlist_lock); + mutex_lock(&tm6000_devlist_mutex); } -diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-dvb.c linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-dvb.c ---- linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-dvb.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-dvb.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-dvb.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/tm6000/tm6000-dvb.c ++++ linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-dvb.c @@ -1,20 +1,20 @@ /* - tm6000-dvb.c - dvb-t support for TM5600/TM6000/TM6010 USB video capture devices @@ -160964,9 +161739,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-dvb.c linux-2.6.35 + +module_init(tm6000_dvb_register); +module_exit(tm6000_dvb_unregister); -diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000.h linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000.h ---- linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/tm6000/tm6000.h ++++ linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000.h @@ -1,27 +1,27 @@ /* - tm6000.h - driver for TM5600/TM6000/TM6010 USB video capture devices @@ -161249,9 +162025,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000.h linux-2.6.35.x86 __FUNCTION__ , ##arg); } while (0) - - -diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-i2c.c linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-i2c.c ---- linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-i2c.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-i2c.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-i2c.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/tm6000/tm6000-i2c.c ++++ linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-i2c.c @@ -1,23 +1,23 @@ /* - tm6000-i2c.c - driver for TM5600/TM6000/TM6010 USB video capture devices @@ -161410,9 +162187,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-i2c.c linux-2.6.35 tm6000_i2c_eeprom(dev, eedata, sizeof(eedata)); -diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-input.c linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-input.c ---- linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-input.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-input.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-input.c +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-input.c @@ -0,0 +1,367 @@ +/* + * tm6000-input.c - driver for TM5600/TM6000/TM6010 USB video capture devices @@ -161781,9 +162559,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-input.c linux-2.6. + + return 0; +} -diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-regs.h linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-regs.h ---- linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-regs.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-regs.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-regs.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/tm6000/tm6000-regs.h ++++ linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-regs.h @@ -1,20 +1,20 @@ /* - tm6000-regs.h - driver for TM5600/TM6000/TM6010 USB video capture devices @@ -161821,9 +162600,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-regs.h linux-2.6.3 */ /* -diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-stds.c linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-stds.c ---- linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-stds.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-stds.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-stds.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/tm6000/tm6000-stds.c ++++ linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-stds.c @@ -1,20 +1,20 @@ /* - tm6000-stds.c - driver for TM5600/TM6000/TM6010 USB video capture devices @@ -162499,9 +163279,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-stds.c linux-2.6.3 goto ret; } } -diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-usb-isoc.h linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-usb-isoc.h ---- linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-usb-isoc.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-usb-isoc.h 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-usb-isoc.h +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/tm6000/tm6000-usb-isoc.h ++++ linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-usb-isoc.h @@ -1,20 +1,20 @@ /* - tm6000-buf.c - driver for TM5600/TM6000/TM6010 USB video capture devices @@ -162556,9 +163337,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-usb-isoc.h linux-2 - /* Stores the number of received fields */ - int nfields; }; -diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-video.c linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-video.c ---- linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-video.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/drivers/staging/tm6000/tm6000-video.c 2010-12-15 11:13:14.000000000 -0500 +Index: linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-video.c +=================================================================== +--- linux-2.6.35.x86_64.orig/drivers/staging/tm6000/tm6000-video.c ++++ linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-video.c @@ -1,23 +1,23 @@ /* - tm6000-video.c - driver for TM5600/TM6000/TM6010 USB video capture devices @@ -163883,9 +164665,10 @@ diff -Naurp linux-2.6.35.x86_64/drivers/staging/tm6000/tm6000-video.c linux-2.6. +module_param(vid_limit, int, 0644); +MODULE_PARM_DESC(vid_limit, "capture memory limit in megabytes"); -diff -Naurp linux-2.6.35.x86_64/firmware/ihex2fw.c linux-2.6.35.x86_64.new/firmware/ihex2fw.c ---- linux-2.6.35.x86_64/firmware/ihex2fw.c 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/firmware/ihex2fw.c 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/firmware/ihex2fw.c +=================================================================== +--- linux-2.6.35.x86_64.orig/firmware/ihex2fw.c ++++ linux-2.6.35.x86_64/firmware/ihex2fw.c @@ -55,6 +55,7 @@ static int output_records(int outfd); static int sort_records = 0; @@ -163946,9 +164729,10 @@ diff -Naurp linux-2.6.35.x86_64/firmware/ihex2fw.c linux-2.6.35.x86_64.new/firmw goto next_record; default: -diff -Naurp linux-2.6.35.x86_64/include/linux/dvb/frontend.h linux-2.6.35.x86_64.new/include/linux/dvb/frontend.h ---- linux-2.6.35.x86_64/include/linux/dvb/frontend.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/linux/dvb/frontend.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/linux/dvb/frontend.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/linux/dvb/frontend.h ++++ linux-2.6.35.x86_64/include/linux/dvb/frontend.h @@ -62,6 +62,7 @@ typedef enum fe_caps { FE_CAN_8VSB = 0x200000, FE_CAN_16VSB = 0x400000, @@ -163957,9 +164741,10 @@ diff -Naurp linux-2.6.35.x86_64/include/linux/dvb/frontend.h linux-2.6.35.x86_64 FE_CAN_2G_MODULATION = 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */ FE_NEEDS_BENDING = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */ FE_CAN_RECOVER = 0x40000000, /* frontend can recover from a cable unplug automatically */ -diff -Naurp linux-2.6.35.x86_64/include/linux/dvb/version.h linux-2.6.35.x86_64.new/include/linux/dvb/version.h ---- linux-2.6.35.x86_64/include/linux/dvb/version.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/linux/dvb/version.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/linux/dvb/version.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/linux/dvb/version.h ++++ linux-2.6.35.x86_64/include/linux/dvb/version.h @@ -24,6 +24,6 @@ #define _DVBVERSION_H_ @@ -163968,9 +164753,10 @@ diff -Naurp linux-2.6.35.x86_64/include/linux/dvb/version.h linux-2.6.35.x86_64. +#define DVB_API_VERSION_MINOR 2 #endif /*_DVBVERSION_H_*/ -diff -Naurp linux-2.6.35.x86_64/include/linux/i2c-id.h linux-2.6.35.x86_64.new/include/linux/i2c-id.h ---- linux-2.6.35.x86_64/include/linux/i2c-id.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/linux/i2c-id.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/linux/i2c-id.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/linux/i2c-id.h ++++ linux-2.6.35.x86_64/include/linux/i2c-id.h @@ -32,28 +32,6 @@ */ @@ -164000,9 +164786,10 @@ diff -Naurp linux-2.6.35.x86_64/include/linux/i2c-id.h linux-2.6.35.x86_64.new/i -#define I2C_HW_SAA7134 0x090000 /* SAA7134 video decoder bus */ #endif /* LINUX_I2C_ID_H */ -diff -Naurp linux-2.6.35.x86_64/include/linux/mmc/sdio_ids.h linux-2.6.35.x86_64.new/include/linux/mmc/sdio_ids.h ---- linux-2.6.35.x86_64/include/linux/mmc/sdio_ids.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/linux/mmc/sdio_ids.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/linux/mmc/sdio_ids.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/linux/mmc/sdio_ids.h ++++ linux-2.6.35.x86_64/include/linux/mmc/sdio_ids.h @@ -18,6 +18,7 @@ #define SDIO_CLASS_PHS 0x06 /* PHS standard interface */ #define SDIO_CLASS_WLAN 0x07 /* WLAN interface */ @@ -164011,9 +164798,10 @@ diff -Naurp linux-2.6.35.x86_64/include/linux/mmc/sdio_ids.h linux-2.6.35.x86_64 /* * Vendors and devices. Sort key: vendor first, device next. -diff -Naurp linux-2.6.35.x86_64/include/linux/usb/video.h linux-2.6.35.x86_64.new/include/linux/usb/video.h ---- linux-2.6.35.x86_64/include/linux/usb/video.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/linux/usb/video.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/linux/usb/video.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/linux/usb/video.h ++++ linux-2.6.35.x86_64/include/linux/usb/video.h @@ -160,5 +160,409 @@ #define UVC_STATUS_TYPE_CONTROL 1 #define UVC_STATUS_TYPE_STREAMING 2 @@ -164424,9 +165212,10 @@ diff -Naurp linux-2.6.35.x86_64/include/linux/usb/video.h linux-2.6.35.x86_64.ne + #endif /* __LINUX_USB_VIDEO_H */ -diff -Naurp linux-2.6.35.x86_64/include/linux/videodev2.h linux-2.6.35.x86_64.new/include/linux/videodev2.h ---- linux-2.6.35.x86_64/include/linux/videodev2.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/linux/videodev2.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/linux/videodev2.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/linux/videodev2.h ++++ linux-2.6.35.x86_64/include/linux/videodev2.h @@ -277,6 +277,7 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R', 'G', 'B', 'P') /* 16 RGB-5-6-5 */ #define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16 RGB-5-5-5 BE */ @@ -164476,9 +165265,10 @@ diff -Naurp linux-2.6.35.x86_64/include/linux/videodev2.h linux-2.6.35.x86_64.ne }; /* -diff -Naurp linux-2.6.35.x86_64/include/media/cx2341x.h linux-2.6.35.x86_64.new/include/media/cx2341x.h ---- linux-2.6.35.x86_64/include/media/cx2341x.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/cx2341x.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/cx2341x.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/cx2341x.h ++++ linux-2.6.35.x86_64/include/media/cx2341x.h @@ -19,6 +19,8 @@ #ifndef CX2341X_H #define CX2341X_H @@ -164590,9 +165380,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/cx2341x.h linux-2.6.35.x86_64.new/ /* Firmware names */ #define CX2341X_FIRM_ENC_FILENAME "v4l-cx2341x-enc.fw" /* Decoder firmware for the cx23415 only */ -diff -Naurp linux-2.6.35.x86_64/include/media/cx25840.h linux-2.6.35.x86_64.new/include/media/cx25840.h ---- linux-2.6.35.x86_64/include/media/cx25840.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/cx25840.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/cx25840.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/cx25840.h ++++ linux-2.6.35.x86_64/include/media/cx25840.h @@ -97,4 +97,91 @@ enum cx25840_audio_input { CX25840_AUDIO8, }; @@ -164685,9 +165476,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/cx25840.h linux-2.6.35.x86_64.new/ +}; + #endif -diff -Naurp linux-2.6.35.x86_64/include/media/ir-core.h linux-2.6.35.x86_64.new/include/media/ir-core.h ---- linux-2.6.35.x86_64/include/media/ir-core.h 2010-12-15 11:12:36.000000000 -0500 -+++ linux-2.6.35.x86_64.new/include/media/ir-core.h 1969-12-31 19:00:00.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/ir-core.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/ir-core.h ++++ /dev/null @@ -1,148 +0,0 @@ -/* - * Remote Controller core header @@ -164837,9 +165629,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/ir-core.h linux-2.6.35.x86_64.new/ -} - -#endif /* _IR_CORE */ -diff -Naurp linux-2.6.35.x86_64/include/media/ir-kbd-i2c.h linux-2.6.35.x86_64.new/include/media/ir-kbd-i2c.h ---- linux-2.6.35.x86_64/include/media/ir-kbd-i2c.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/ir-kbd-i2c.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/ir-kbd-i2c.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/ir-kbd-i2c.h ++++ linux-2.6.35.x86_64/include/media/ir-kbd-i2c.h @@ -1,20 +1,22 @@ #ifndef _IR_I2C #define _IR_I2C @@ -164895,9 +165688,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/ir-kbd-i2c.h linux-2.6.35.x86_64.n + struct rc_dev *rc_dev; }; #endif -diff -Naurp linux-2.6.35.x86_64/include/media/lirc_dev.h linux-2.6.35.x86_64.new/include/media/lirc_dev.h ---- linux-2.6.35.x86_64/include/media/lirc_dev.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/include/media/lirc_dev.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/lirc_dev.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/include/media/lirc_dev.h @@ -0,0 +1,225 @@ +/* + * LIRC base driver @@ -165124,9 +165918,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/lirc_dev.h linux-2.6.35.x86_64.new + size_t length, loff_t *ppos); + +#endif -diff -Naurp linux-2.6.35.x86_64/include/media/lirc.h linux-2.6.35.x86_64.new/include/media/lirc.h ---- linux-2.6.35.x86_64/include/media/lirc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/include/media/lirc.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/lirc.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/include/media/lirc.h @@ -0,0 +1,168 @@ +/* + * lirc.h - linux infrared remote control header file @@ -165296,9 +166091,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/lirc.h linux-2.6.35.x86_64.new/inc +#define LIRC_SET_WIDEBAND_RECEIVER _IOW('i', 0x00000023, __u32) + +#endif -diff -Naurp linux-2.6.35.x86_64/include/media/omap1_camera.h linux-2.6.35.x86_64.new/include/media/omap1_camera.h ---- linux-2.6.35.x86_64/include/media/omap1_camera.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/include/media/omap1_camera.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/omap1_camera.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/include/media/omap1_camera.h @@ -0,0 +1,35 @@ +/* + * Header for V4L2 SoC Camera driver for OMAP1 Camera Interface @@ -165335,10 +166131,11 @@ diff -Naurp linux-2.6.35.x86_64/include/media/omap1_camera.h linux-2.6.35.x86_64 +#define OMAP1_CAMERA_RST_HIGH BIT(2) + +#endif /* __MEDIA_OMAP1_CAMERA_H_ */ -diff -Naurp linux-2.6.35.x86_64/include/media/rc-core.h linux-2.6.35.x86_64.new/include/media/rc-core.h ---- linux-2.6.35.x86_64/include/media/rc-core.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/include/media/rc-core.h 2010-12-15 11:13:26.000000000 -0500 -@@ -0,0 +1,220 @@ +Index: linux-2.6.35.x86_64/include/media/rc-core.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/include/media/rc-core.h +@@ -0,0 +1,221 @@ +/* + * Remote Controller core header + * @@ -165524,6 +166321,7 @@ diff -Naurp linux-2.6.35.x86_64/include/media/rc-core.h linux-2.6.35.x86_64.new/ +} + +#define IR_MAX_DURATION 0xFFFFFFFF /* a bit more than 4 seconds */ ++#define MS_TO_US(msec) ((msec) * 1000) + +void ir_raw_event_handle(struct rc_dev *dev); +int ir_raw_event_store(struct rc_dev *dev, struct ir_raw_event *ev); @@ -165559,9 +166357,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/rc-core.h linux-2.6.35.x86_64.new/ +} + +#endif /* _RC_CORE */ -diff -Naurp linux-2.6.35.x86_64/include/media/rc-map.h linux-2.6.35.x86_64.new/include/media/rc-map.h ---- linux-2.6.35.x86_64/include/media/rc-map.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/rc-map.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/rc-map.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/rc-map.h ++++ linux-2.6.35.x86_64/include/media/rc-map.h @@ -11,44 +11,52 @@ #include @@ -165688,9 +166487,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/rc-map.h linux-2.6.35.x86_64.new/i /* * Please, do not just append newer Remote Controller names at the end. * The names should be ordered in alphabetical order -diff -Naurp linux-2.6.35.x86_64/include/media/s3c_fimc.h linux-2.6.35.x86_64.new/include/media/s3c_fimc.h ---- linux-2.6.35.x86_64/include/media/s3c_fimc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/include/media/s3c_fimc.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/s3c_fimc.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/include/media/s3c_fimc.h @@ -0,0 +1,60 @@ +/* + * Samsung S5P SoC camera interface driver header @@ -165752,9 +166552,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/s3c_fimc.h linux-2.6.35.x86_64.new + struct s3c_fimc_isp_info *isp_info[FIMC_MAX_CAMIF_CLIENTS]; +}; +#endif /* S3C_FIMC_H_ */ -diff -Naurp linux-2.6.35.x86_64/include/media/sh_mobile_ceu.h linux-2.6.35.x86_64.new/include/media/sh_mobile_ceu.h ---- linux-2.6.35.x86_64/include/media/sh_mobile_ceu.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/sh_mobile_ceu.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/sh_mobile_ceu.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/sh_mobile_ceu.h ++++ linux-2.6.35.x86_64/include/media/sh_mobile_ceu.h @@ -6,8 +6,11 @@ #define SH_CEU_FLAG_HSYNC_LOW (1 << 2) /* default High if possible */ #define SH_CEU_FLAG_VSYNC_LOW (1 << 3) /* default High if possible */ @@ -165767,9 +166568,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/sh_mobile_ceu.h linux-2.6.35.x86_6 }; #endif /* __ASM_SH_MOBILE_CEU_H__ */ -diff -Naurp linux-2.6.35.x86_64/include/media/sh_mobile_csi2.h linux-2.6.35.x86_64.new/include/media/sh_mobile_csi2.h ---- linux-2.6.35.x86_64/include/media/sh_mobile_csi2.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/include/media/sh_mobile_csi2.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/sh_mobile_csi2.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/include/media/sh_mobile_csi2.h @@ -0,0 +1,46 @@ +/* + * Driver header for the SH-Mobile MIPI CSI-2 unit @@ -165817,9 +166619,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/sh_mobile_csi2.h linux-2.6.35.x86_ +struct v4l2_device; + +#endif -diff -Naurp linux-2.6.35.x86_64/include/media/sh_vou.h linux-2.6.35.x86_64.new/include/media/sh_vou.h ---- linux-2.6.35.x86_64/include/media/sh_vou.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/sh_vou.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/sh_vou.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/sh_vou.h ++++ linux-2.6.35.x86_64/include/media/sh_vou.h @@ -28,7 +28,6 @@ struct sh_vou_pdata { int i2c_adap; struct i2c_board_info *board_info; @@ -165828,9 +166631,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/sh_vou.h linux-2.6.35.x86_64.new/i }; #endif -diff -Naurp linux-2.6.35.x86_64/include/media/si4713.h linux-2.6.35.x86_64.new/include/media/si4713.h ---- linux-2.6.35.x86_64/include/media/si4713.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/si4713.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/si4713.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/si4713.h ++++ linux-2.6.35.x86_64/include/media/si4713.h @@ -23,8 +23,7 @@ * Platform dependent definition */ @@ -165841,9 +166645,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/si4713.h linux-2.6.35.x86_64.new/i }; /* -diff -Naurp linux-2.6.35.x86_64/include/media/soc_camera.h linux-2.6.35.x86_64.new/include/media/soc_camera.h ---- linux-2.6.35.x86_64/include/media/soc_camera.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/soc_camera.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/soc_camera.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/soc_camera.h ++++ linux-2.6.35.x86_64/include/media/soc_camera.h @@ -12,12 +12,17 @@ #ifndef SOC_CAMERA_H #define SOC_CAMERA_H @@ -165883,9 +166688,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/soc_camera.h linux-2.6.35.x86_64.n int (*querycap)(struct soc_camera_host *, struct v4l2_capability *); int (*set_bus_param)(struct soc_camera_device *, __u32); int (*get_ctrl)(struct soc_camera_device *, struct v4l2_control *); -diff -Naurp linux-2.6.35.x86_64/include/media/sr030pc30.h linux-2.6.35.x86_64.new/include/media/sr030pc30.h ---- linux-2.6.35.x86_64/include/media/sr030pc30.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/include/media/sr030pc30.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/sr030pc30.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/include/media/sr030pc30.h @@ -0,0 +1,21 @@ +/* + * Driver header for SR030PC30 camera sensor @@ -165908,9 +166714,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/sr030pc30.h linux-2.6.35.x86_64.ne +}; + +#endif /* SR030PC30_H */ -diff -Naurp linux-2.6.35.x86_64/include/media/timb_radio.h linux-2.6.35.x86_64.new/include/media/timb_radio.h ---- linux-2.6.35.x86_64/include/media/timb_radio.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/timb_radio.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/timb_radio.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/timb_radio.h ++++ linux-2.6.35.x86_64/include/media/timb_radio.h @@ -24,7 +24,6 @@ struct timb_radio_platform_data { int i2c_adapter; /* I2C adapter where the tuner and dsp are attached */ @@ -165919,9 +166726,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/timb_radio.h linux-2.6.35.x86_64.n struct i2c_board_info *info; } tuner; struct { -diff -Naurp linux-2.6.35.x86_64/include/media/timb_video.h linux-2.6.35.x86_64.new/include/media/timb_video.h ---- linux-2.6.35.x86_64/include/media/timb_video.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/include/media/timb_video.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/timb_video.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/include/media/timb_video.h @@ -0,0 +1,33 @@ +/* + * timb_video.h Platform struct for the Timberdale video driver @@ -165956,9 +166764,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/timb_video.h linux-2.6.35.x86_64.n +}; + +#endif -diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-chip-ident.h linux-2.6.35.x86_64.new/include/media/v4l2-chip-ident.h ---- linux-2.6.35.x86_64/include/media/v4l2-chip-ident.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/v4l2-chip-ident.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/v4l2-chip-ident.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/v4l2-chip-ident.h ++++ linux-2.6.35.x86_64/include/media/v4l2-chip-ident.h @@ -38,6 +38,9 @@ enum { /* module tvaudio: reserved range 50-99 */ V4L2_IDENT_TVAUDIO = 50, /* A tvaudio chip, unknown which it is exactly */ @@ -165988,9 +166797,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-chip-ident.h linux-2.6.35.x86 /* module tvp5150 */ V4L2_IDENT_TVP5150 = 5150, -diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-common.h linux-2.6.35.x86_64.new/include/media/v4l2-common.h ---- linux-2.6.35.x86_64/include/media/v4l2-common.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/v4l2-common.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/v4l2-common.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/v4l2-common.h ++++ linux-2.6.35.x86_64/include/media/v4l2-common.h @@ -137,31 +137,27 @@ struct v4l2_subdev_ops; @@ -166044,9 +166854,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-common.h linux-2.6.35.x86_64. + s32 width, s32 height); + #endif /* V4L2_COMMON_H_ */ -diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-ctrls.h linux-2.6.35.x86_64.new/include/media/v4l2-ctrls.h ---- linux-2.6.35.x86_64/include/media/v4l2-ctrls.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.35.x86_64.new/include/media/v4l2-ctrls.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/v4l2-ctrls.h +=================================================================== +--- /dev/null ++++ linux-2.6.35.x86_64/include/media/v4l2-ctrls.h @@ -0,0 +1,460 @@ +/* + V4L2 controls support header. @@ -166508,9 +167319,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-ctrls.h linux-2.6.35.x86_64.n +int v4l2_subdev_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl); + +#endif -diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-dev.h linux-2.6.35.x86_64.new/include/media/v4l2-dev.h ---- linux-2.6.35.x86_64/include/media/v4l2-dev.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/v4l2-dev.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/v4l2-dev.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/v4l2-dev.h ++++ linux-2.6.35.x86_64/include/media/v4l2-dev.h @@ -21,12 +21,12 @@ #define VFL_TYPE_GRABBER 0 #define VFL_TYPE_VBI 1 @@ -166555,9 +167367,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-dev.h linux-2.6.35.x86_64.new }; /* dev to video-device */ -diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-device.h linux-2.6.35.x86_64.new/include/media/v4l2-device.h ---- linux-2.6.35.x86_64/include/media/v4l2-device.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/v4l2-device.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/v4l2-device.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/v4l2-device.h ++++ linux-2.6.35.x86_64/include/media/v4l2-device.h @@ -32,6 +32,8 @@ #define V4L2_DEVICE_NAME_SIZE (20 + 16) @@ -166662,9 +167475,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-device.h linux-2.6.35.x86_64. +}) #endif -diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-mediabus.h linux-2.6.35.x86_64.new/include/media/v4l2-mediabus.h ---- linux-2.6.35.x86_64/include/media/v4l2-mediabus.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/v4l2-mediabus.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/v4l2-mediabus.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/v4l2-mediabus.h ++++ linux-2.6.35.x86_64/include/media/v4l2-mediabus.h @@ -24,14 +24,22 @@ */ enum v4l2_mbus_pixelcode { @@ -166704,9 +167518,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-mediabus.h linux-2.6.35.x86_6 }; /** -diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-subdev.h linux-2.6.35.x86_64.new/include/media/v4l2-subdev.h ---- linux-2.6.35.x86_64/include/media/v4l2-subdev.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/v4l2-subdev.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/v4l2-subdev.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/v4l2-subdev.h ++++ linux-2.6.35.x86_64/include/media/v4l2-subdev.h @@ -35,6 +35,7 @@ #define V4L2_SUBDEV_IR_TX_FIFO_SERVICE_REQ 0x00000001 @@ -166886,9 +167701,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/v4l2-subdev.h linux-2.6.35.x86_64. } /* Call an ops of a v4l2_subdev, doing the right checks against -diff -Naurp linux-2.6.35.x86_64/include/media/videobuf-core.h linux-2.6.35.x86_64.new/include/media/videobuf-core.h ---- linux-2.6.35.x86_64/include/media/videobuf-core.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/videobuf-core.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/videobuf-core.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/videobuf-core.h ++++ linux-2.6.35.x86_64/include/media/videobuf-core.h @@ -54,8 +54,6 @@ struct videobuf_queue; struct videobuf_mapping { @@ -166952,9 +167768,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/videobuf-core.h linux-2.6.35.x86_6 int videobuf_queue_is_busy(struct videobuf_queue *q); void videobuf_queue_cancel(struct videobuf_queue *q); -diff -Naurp linux-2.6.35.x86_64/include/media/videobuf-dma-contig.h linux-2.6.35.x86_64.new/include/media/videobuf-dma-contig.h ---- linux-2.6.35.x86_64/include/media/videobuf-dma-contig.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/videobuf-dma-contig.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/videobuf-dma-contig.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/videobuf-dma-contig.h ++++ linux-2.6.35.x86_64/include/media/videobuf-dma-contig.h @@ -23,7 +23,8 @@ void videobuf_queue_dma_contig_init(stru enum v4l2_buf_type type, enum v4l2_field field, @@ -166965,9 +167782,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/videobuf-dma-contig.h linux-2.6.35 dma_addr_t videobuf_to_dma_contig(struct videobuf_buffer *buf); void videobuf_dma_contig_free(struct videobuf_queue *q, -diff -Naurp linux-2.6.35.x86_64/include/media/videobuf-dma-sg.h linux-2.6.35.x86_64.new/include/media/videobuf-dma-sg.h ---- linux-2.6.35.x86_64/include/media/videobuf-dma-sg.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/videobuf-dma-sg.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/videobuf-dma-sg.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/videobuf-dma-sg.h ++++ linux-2.6.35.x86_64/include/media/videobuf-dma-sg.h @@ -25,23 +25,6 @@ /* --------------------------------------------------------------------- */ @@ -167049,9 +167867,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/videobuf-dma-sg.h linux-2.6.35.x86 #endif /* _VIDEOBUF_DMA_SG_H */ -diff -Naurp linux-2.6.35.x86_64/include/media/videobuf-vmalloc.h linux-2.6.35.x86_64.new/include/media/videobuf-vmalloc.h ---- linux-2.6.35.x86_64/include/media/videobuf-vmalloc.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/videobuf-vmalloc.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/videobuf-vmalloc.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/videobuf-vmalloc.h ++++ linux-2.6.35.x86_64/include/media/videobuf-vmalloc.h @@ -22,7 +22,7 @@ struct videobuf_vmalloc_memory { u32 magic; @@ -167071,9 +167890,10 @@ diff -Naurp linux-2.6.35.x86_64/include/media/videobuf-vmalloc.h linux-2.6.35.x8 void *videobuf_to_vmalloc(struct videobuf_buffer *buf); -diff -Naurp linux-2.6.35.x86_64/include/media/wm8775.h linux-2.6.35.x86_64.new/include/media/wm8775.h ---- linux-2.6.35.x86_64/include/media/wm8775.h 2010-08-01 18:11:14.000000000 -0400 -+++ linux-2.6.35.x86_64.new/include/media/wm8775.h 2010-12-15 11:13:26.000000000 -0500 +Index: linux-2.6.35.x86_64/include/media/wm8775.h +=================================================================== +--- linux-2.6.35.x86_64.orig/include/media/wm8775.h ++++ linux-2.6.35.x86_64/include/media/wm8775.h @@ -32,4 +32,7 @@ #define WM8775_AIN3 4 #define WM8775_AIN4 8