summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-08 23:27:32 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-29 08:35:37 -0200
commitdbdf03b48bd32150b4023ea0dd22f566958b6294 (patch)
treecee6b82e0170d2fa6f2f17b1adfb87ff24e72925 /drivers/media/video
parentd7e43844e40e07cadc48f1733b9738659f83b38c (diff)
downloadop-kernel-dev-dbdf03b48bd32150b4023ea0dd22f566958b6294.zip
op-kernel-dev-dbdf03b48bd32150b4023ea0dd22f566958b6294.tar.gz
V4L/DVB (10208): zoran: Re-adds udev entry removed by changeset 60b4bde4
Changeset 60b4bde48b36c0315ef41fd38c339b9c7e68c46f removed an unused struct on zoran driver, when compiled with "Y". However, as pointed by Jean Delvare <khali@linux-fr.org>, this is neeeded when the driver is compiled as a module, since udev relies on it to auto-load the module. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/zoran/zoran_card.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index 05f3919..4e8ecf3 100644
--- a/drivers/media/video/zoran/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
@@ -153,6 +153,14 @@ MODULE_DESCRIPTION("Zoran-36057/36067 JPEG codec driver");
MODULE_AUTHOR("Serguei Miridonov");
MODULE_LICENSE("GPL");
+#if (defined(CONFIG_VIDEO_ZORAN_MODULE) && defined(MODULE))
+static struct pci_device_id zr36067_pci_tbl[] = {
+ {PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36057,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0}
+};
+MODULE_DEVICE_TABLE(pci, zr36067_pci_tbl);
+#endif
int zoran_num; /* number of Buzs in use */
struct zoran *zoran[BUZ_MAX];
OpenPOWER on IntegriCloud