diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-cards.c | 5 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 2 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 2 |
4 files changed, 0 insertions, 11 deletions
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index e68a6d2fff24..5b4d45654d8e 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
@@ -3548,11 +3548,6 @@ void __devinit bttv_init_card2(struct bttv *btv) | |||
3548 | /* Hybrid DVB card, DOES have a tda9887 */ | 3548 | /* Hybrid DVB card, DOES have a tda9887 */ |
3549 | if (btv->c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE) | 3549 | if (btv->c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE) |
3550 | tda9887 = 1; | 3550 | tda9887 = 1; |
3551 | if((btv->tuner_type == TUNER_PHILIPS_FM1216ME_MK3) || | ||
3552 | (btv->tuner_type == TUNER_PHILIPS_FM1236_MK3) || | ||
3553 | (btv->tuner_type == TUNER_PHILIPS_FM1256_IH3) || | ||
3554 | tda9887) | ||
3555 | request_module("tda9887"); | ||
3556 | if (btv->tuner_type != UNSET) | 3551 | if (btv->tuner_type != UNSET) |
3557 | request_module("tuner"); | 3552 | request_module("tuner"); |
3558 | } | 3553 | } |
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index fe147e3aaa70..c538d99ec9f6 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -1926,8 +1926,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, | |||
1926 | /* load and configure helper modules */ | 1926 | /* load and configure helper modules */ |
1927 | if (TUNER_ABSENT != core->tuner_type) | 1927 | if (TUNER_ABSENT != core->tuner_type) |
1928 | request_module("tuner"); | 1928 | request_module("tuner"); |
1929 | if (core->tda9887_conf) | ||
1930 | request_module("tda9887"); | ||
1931 | 1929 | ||
1932 | /* register v4l devices */ | 1930 | /* register v4l devices */ |
1933 | dev->video_dev = cx88_vdev_init(core,dev->pci, | 1931 | dev->video_dev = cx88_vdev_init(core,dev->pci, |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 9286090817cd..2a461dde480c 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -1574,8 +1574,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | |||
1574 | request_module("tvp5150"); | 1574 | request_module("tvp5150"); |
1575 | if (dev->has_tuner) | 1575 | if (dev->has_tuner) |
1576 | request_module("tuner"); | 1576 | request_module("tuner"); |
1577 | if (dev->tda9887_conf) | ||
1578 | request_module("tda9887"); | ||
1579 | #endif | 1577 | #endif |
1580 | errCode = em28xx_config(dev); | 1578 | errCode = em28xx_config(dev); |
1581 | if (errCode) { | 1579 | if (errCode) { |
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index da3007d2f411..2cd73c980533 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -942,8 +942,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, | |||
942 | /* load i2c helpers */ | 942 | /* load i2c helpers */ |
943 | if (TUNER_ABSENT != dev->tuner_type) | 943 | if (TUNER_ABSENT != dev->tuner_type) |
944 | request_module("tuner"); | 944 | request_module("tuner"); |
945 | if (dev->tda9887_conf) | ||
946 | request_module("tda9887"); | ||
947 | if (card_is_empress(dev)) { | 945 | if (card_is_empress(dev)) { |
948 | request_module("saa6752hs"); | 946 | request_module("saa6752hs"); |
949 | request_module_depend("saa7134-empress",&need_empress); | 947 | request_module_depend("saa7134-empress",&need_empress); |