diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-16 12:12:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-16 12:12:24 -0300 |
| commit | 610e9fdc6f1ffa937eb4e499f202ea75deb1ff03 (patch) | |
| tree | 04cbce00fc810196c5215891a48b632f835d1afd /linux | |
| parent | ef1300c8dfd94bca1d2bc80ea3629d644e23ef3b (diff) | |
| parent | 3a3a1ddb800579a7b162ce3309d72cee97211de8 (diff) | |
| download | mediapointer-dvb-s2-610e9fdc6f1ffa937eb4e499f202ea75deb1ff03.tar.gz mediapointer-dvb-s2-610e9fdc6f1ffa937eb4e499f202ea75deb1ff03.tar.bz2 | |
merge: http://linuxtv.org/hg/~endriss/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/tda1002x.h | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/Makefile | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/frontends/tda1002x.h b/linux/drivers/media/dvb/frontends/tda1002x.h index afc0a32ea..04d19418b 100644 --- a/linux/drivers/media/dvb/frontends/tda1002x.h +++ b/linux/drivers/media/dvb/frontends/tda1002x.h @@ -76,7 +76,7 @@ extern struct dvb_frontend *tda10023_attach( 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 --git a/linux/drivers/media/dvb/ttpci/Makefile b/linux/drivers/media/dvb/ttpci/Makefile index 3819390b1..714512372 100644 --- a/linux/drivers/media/dvb/ttpci/Makefile +++ b/linux/drivers/media/dvb/ttpci/Makefile @@ -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 |