diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 1084deb3e..827893f9c 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -159,6 +159,10 @@ struct cx88_board cx88_boards[] = { .type = CX88_VMUX_COMPOSITE1, .vmux = 1, },{ + // temporarly for testing ... + .type = CX88_VMUX_COMPOSITE2, + .vmux = 2, + },{ .type = CX88_VMUX_SVIDEO, .vmux = 2, }}, @@ -169,6 +173,7 @@ struct cx88_board cx88_boards[] = { [CX88_BOARD_WINFAST_DV2000] = { .name = "Leadtek Winfast DV2000", .tuner_type = 38, + .needs_tda9887 = 1, .input = {{ .type = CX88_VMUX_TELEVISION, .vmux = 0, diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index f35b43894..bc6051192 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -2415,6 +2415,8 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, OOPS("configure i2c clients"); if (TUNER_ABSENT != dev->tuner_type) request_module("tuner"); + if (cx88_boards[dev->board].needs_tda9887) + request_module("tda9887"); if (dev->tuner_type != UNSET) cx8800_call_i2c_clients(dev,TUNER_SET_TYPE,&dev->tuner_type); diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index f06178e5a..277a71be1 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -163,6 +163,7 @@ struct cx88_input { struct cx88_board { char *name; unsigned int tuner_type; + int needs_tda9887:1; struct cx88_input input[8]; struct cx88_input radio; }; diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index afee20b3c..e668253e1 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -2,7 +2,7 @@ * device driver for philips saa7134 based TV cards * card-specific stuff. * - * (c) 2001-03 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] + * (c) 2001-04 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] * * 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 |