summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/zoran/zoran_card.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-09 00:27:32 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-09 00:27:32 -0200
commit66bbf1302a15fc58a244694583e5b2caf70203fe (patch)
tree16cd28b0bcc396e672ea508598570abbadb97bb1 /linux/drivers/media/video/zoran/zoran_card.c
parent8a4232cdf32b41a29b6bb9c34461073f0ca6cc29 (diff)
downloadmediapointer-dvb-s2-66bbf1302a15fc58a244694583e5b2caf70203fe.tar.gz
mediapointer-dvb-s2-66bbf1302a15fc58a244694583e5b2caf70203fe.tar.bz2
zoran: Re-adds udev entry removed by changeset 60b4bde4
From: Mauro Carvalho Chehab <mchehab@redhat.com> 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. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/zoran/zoran_card.c')
-rw-r--r--linux/drivers/media/video/zoran/zoran_card.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_card.c b/linux/drivers/media/video/zoran/zoran_card.c
index 639fa55e6..db8fd103d 100644
--- a/linux/drivers/media/video/zoran/zoran_card.c
+++ b/linux/drivers/media/video/zoran/zoran_card.c
@@ -154,7 +154,7 @@ MODULE_DESCRIPTION("Zoran-36057/36067 JPEG codec driver");
MODULE_AUTHOR("Serguei Miridonov");
MODULE_LICENSE("GPL");
-#if 0
+#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},