diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-25 14:33:20 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-25 14:33:20 -0300 |
| commit | 129f9913b28a40d3215a7251caf0b2a4f9f2470b (patch) | |
| tree | 1bc7a94728013fc90fc870107ebc393419603c4b /linux/drivers/media/video/bt8xx | |
| parent | 1737d06d9d3b77807244c3f0fdb1b6f62a201af0 (diff) | |
| parent | 91cb86194d6146eb1da0f838116b5bc752a0c62d (diff) | |
| download | mediapointer-dvb-s2-129f9913b28a40d3215a7251caf0b2a4f9f2470b.tar.gz mediapointer-dvb-s2-129f9913b28a40d3215a7251caf0b2a4f9f2470b.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tda18271c2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-cards.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttvp.h | 1 |
4 files changed, 10 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c index 1a1c9699c..177b75ebc 100644 --- a/linux/drivers/media/video/bt8xx/bttv-cards.c +++ b/linux/drivers/media/video/bt8xx/bttv-cards.c @@ -3072,9 +3072,13 @@ struct tvcard bttv_tvcards[] = { .gpiomask = 0x008007, .muxsel = { 2, 3, 1, 1 }, .gpiomux = { 0, 1, 2, 2 }, /* CONTVFMi */ - /*gpiomux = { 0, 1, 2, 3 }, /* MagicTV */ +#if 0 + .gpiomux = { 0, 1, 2, 3 }, /* MagicTV */ +#endif .gpiomute = 3, /* CONTVFMi */ - /*gpiomute = 4, /* MagicTV */ +#if 0 + .gpiomute = 4, /* MagicTV */ +#endif .needs_tvaudio = 0, .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MK3 */ .tuner_addr = ADDR_UNSET, diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index 05c2e8a96..51b4a8b59 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -3654,6 +3654,9 @@ static const struct file_operations radio_fops = .open = radio_open, .read = radio_read, .release = radio_release, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11) + .compat_ioctl = v4l_compat_ioctl32, +#endif .ioctl = video_ioctl2, .llseek = no_llseek, .poll = radio_poll, diff --git a/linux/drivers/media/video/bt8xx/bttv.h b/linux/drivers/media/video/bt8xx/bttv.h index bb339c83f..4c73aacdb 100644 --- a/linux/drivers/media/video/bt8xx/bttv.h +++ b/linux/drivers/media/video/bt8xx/bttv.h @@ -20,6 +20,7 @@ #include <media/ir-common.h> #include <media/ir-kbd-i2c.h> #include <media/i2c-addr.h> +#include <media/tuner.h> /* ---------------------------------------------------------- */ /* exported by bttv-cards.c */ diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h index e868e1e21..e9219458e 100644 --- a/linux/drivers/media/video/bt8xx/bttvp.h +++ b/linux/drivers/media/video/bt8xx/bttvp.h @@ -50,7 +50,6 @@ #include <linux/device.h> #endif #include <media/videobuf-dma-sg.h> -#include <media/tuner.h> #include <media/tveeprom.h> #include <media/ir-common.h> |