The patch number 8336 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.

Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel

If anyone has any objections, please let us know by sending a message to:
        [EMAIL PROTECTED]

------

From: Mauro Carvalho Chehab  <[EMAIL PROTECTED]>
merge: http://linuxtv.org/hg/~endriss/v4l-dvb


Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>


---

 linux/drivers/media/dvb/frontends/tda1002x.h |    2 +-
 linux/drivers/media/dvb/ttpci/Makefile       |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff -r 8320f75ad3a0 -r b5f68f4bc338 
linux/drivers/media/dvb/frontends/tda1002x.h
--- a/linux/drivers/media/dvb/frontends/tda1002x.h      Wed Jul 16 11:55:09 
2008 -0300
+++ b/linux/drivers/media/dvb/frontends/tda1002x.h      Wed Jul 16 12:12:24 
2008 -0300
@@ -76,7 +76,7 @@ extern struct dvb_frontend *tda10023_att
        struct i2c_adapter *i2c, u8 pwm);
 #else
 static inline struct dvb_frontend *tda10023_attach(
-       const struct tda1002x_config *config,
+       const struct tda10023_config *config,
        struct i2c_adapter *i2c, u8 pwm)
 {
        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
diff -r 8320f75ad3a0 -r b5f68f4bc338 linux/drivers/media/dvb/ttpci/Makefile
--- a/linux/drivers/media/dvb/ttpci/Makefile    Wed Jul 16 11:55:09 2008 -0300
+++ b/linux/drivers/media/dvb/ttpci/Makefile    Wed Jul 16 12:12:24 2008 -0300
@@ -3,7 +3,11 @@
 # and the AV7110 DVB device driver
 #
 
-dvb-ttpci-objs := av7110_hw.o av7110_v4l.o av7110_av.o av7110_ca.o av7110.o 
av7110_ipack.o av7110_ir.o
+dvb-ttpci-objs := av7110_hw.o av7110_v4l.o av7110_av.o av7110_ca.o av7110.o 
av7110_ipack.o
+
+ifdef CONFIG_INPUT_EVDEV
+dvb-ttpci-objs += av7110_ir.o
+endif
 
 obj-$(CONFIG_TTPCI_EEPROM) += ttpci-eeprom.o
 obj-$(CONFIG_DVB_BUDGET_CORE) += budget-core.o


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/b5f68f4bc3389059a859069618b1182e02984dc3

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to