diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-17 07:41:50 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-17 07:41:50 +0200 |
| commit | f4b6f27da34d8971eb4b59324c15e94bd062ed21 (patch) | |
| tree | 980fd0be0d0ac3c0606b8b0d6d61b9404bdb67dc /linux/drivers/media/dvb | |
| parent | 2c89d265e6b6dc34bdb2c616731e33e9591088f5 (diff) | |
| parent | 610e9fdc6f1ffa937eb4e499f202ea75deb1ff03 (diff) | |
| download | mediapointer-dvb-s2-f4b6f27da34d8971eb4b59324c15e94bd062ed21.tar.gz mediapointer-dvb-s2-f4b6f27da34d8971eb4b59324c15e94bd062ed21.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/tda1002x.h | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/siano/smscoreapi.h | 3 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/Makefile | 6 |
3 files changed, 8 insertions, 3 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/siano/smscoreapi.h b/linux/drivers/media/dvb/siano/smscoreapi.h index 564f4c0d4..482ef0676 100644 --- a/linux/drivers/media/dvb/siano/smscoreapi.h +++ b/linux/drivers/media/dvb/siano/smscoreapi.h @@ -27,8 +27,9 @@ #include <linux/list.h> #include <linux/mm.h> #include <linux/scatterlist.h> +#include <linux/types.h> #include <asm/page.h> - +#include "compat.h" #include "dmxdev.h" #include "dvbdev.h" #include "dvb_demux.h" 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 |