summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-28 15:27:45 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-28 15:27:45 -0300
commit6bf77e770ed9aaba385261c18ec5c8f16a160e20 (patch)
treee5376cf1e1c8a9c07221f424e05dc22609427c91 /linux/drivers/media/video/em28xx
parentc265cca51af88f5caff789df5ead7de8662ccc0f (diff)
parent1719eff8a6f088e48ed02067ff1a00577f53d1aa (diff)
downloadmediapointer-dvb-s2-6bf77e770ed9aaba385261c18ec5c8f16a160e20.tar.gz
mediapointer-dvb-s2-6bf77e770ed9aaba385261c18ec5c8f16a160e20.tar.bz2
merge: http://linuxtv.org/hg/~hverkuil/tda9887
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/em28xx')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-video.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index 33fe987dd..e7a104098 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -1679,8 +1679,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) {