]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
V4L/DVB (4267): Remove all instances of request_module("tda9887")
authorMichael Krufky <mkrufky@linuxtv.org>
Tue, 27 Jun 2006 03:35:41 +0000 (00:35 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Fri, 30 Jun 2006 18:59:29 +0000 (15:59 -0300)
We should no longer try to load the tda9887 module, because it no longer
exists. The tda9887 driver has been merged into the tuner module.
This patch removes all instances of request_module("tda9887") from
the following video4linux drivers: bttv, cx88, em28xx and saa7134.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/bt8xx/bttv-cards.c
drivers/media/video/cx88/cx88-video.c
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-core.c

index e68a6d2fff2439a94aa8f2b49e393f0916b0724c..5b4d45654d8eae93d9cf154117c19feb5086920c 100644 (file)
@@ -3548,11 +3548,6 @@ void __devinit bttv_init_card2(struct bttv *btv)
        /* Hybrid DVB card, DOES have a tda9887 */
        if (btv->c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE)
                tda9887 = 1;
-       if((btv->tuner_type == TUNER_PHILIPS_FM1216ME_MK3) ||
-          (btv->tuner_type == TUNER_PHILIPS_FM1236_MK3) ||
-          (btv->tuner_type == TUNER_PHILIPS_FM1256_IH3) ||
-           tda9887)
-               request_module("tda9887");
        if (btv->tuner_type != UNSET)
                request_module("tuner");
 }
index fe147e3aaa705172df149d0df56aedb33adb1857..c538d99ec9f66024cfa6352d4c075586f49f84b8 100644 (file)
@@ -1926,8 +1926,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
        /* load and configure helper modules */
        if (TUNER_ABSENT != core->tuner_type)
                request_module("tuner");
-       if (core->tda9887_conf)
-               request_module("tda9887");
 
        /* register v4l devices */
        dev->video_dev = cx88_vdev_init(core,dev->pci,
index 9286090817cd2d564d97a100fd8ceeb99789e4fe..2a461dde480c89c0dcf339920861764a709c89f9 100644 (file)
@@ -1574,8 +1574,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
                request_module("tvp5150");
        if (dev->has_tuner)
                request_module("tuner");
-       if (dev->tda9887_conf)
-               request_module("tda9887");
 #endif
        errCode = em28xx_config(dev);
        if (errCode) {
index da3007d2f4115df49b6a53ba01dec178a7292529..2cd73c980533a35df24d6f58df9e4b3e74bd739f 100644 (file)
@@ -942,8 +942,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
        /* load i2c helpers */
        if (TUNER_ABSENT != dev->tuner_type)
                request_module("tuner");
-       if (dev->tda9887_conf)
-               request_module("tda9887");
        if (card_is_empress(dev)) {
                request_module("saa6752hs");
                request_module_depend("saa7134-empress",&need_empress);