diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 01:31:59 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 01:31:59 -0200 |
| commit | 85ae2dbc568eeaf40b2c1d8426db2d19bb6dfc1b (patch) | |
| tree | a5ec37b92f84eca3402663245880a159abc4dee6 /linux/drivers/media/video/zoran | |
| parent | 9432f298ddeb3d9fd4fa7904e6ec802962e002ff (diff) | |
| parent | b368ca4c3ea78c6d07ee807cbf4f33913adfbc30 (diff) | |
| download | mediapointer-dvb-s2-85ae2dbc568eeaf40b2c1d8426db2d19bb6dfc1b.tar.gz mediapointer-dvb-s2-85ae2dbc568eeaf40b2c1d8426db2d19bb6dfc1b.tar.bz2 | |
merge: http://linuxtv.org/hg/~dheitmueller/v4l-dvb-em28xx-fixes
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/zoran')
| -rw-r--r-- | linux/drivers/media/video/zoran/zoran_card.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_card.c b/linux/drivers/media/video/zoran/zoran_card.c index d5026ae51..639fa55e6 100644 --- a/linux/drivers/media/video/zoran/zoran_card.c +++ b/linux/drivers/media/video/zoran/zoran_card.c @@ -154,12 +154,14 @@ MODULE_DESCRIPTION("Zoran-36057/36067 JPEG codec driver"); MODULE_AUTHOR("Serguei Miridonov"); MODULE_LICENSE("GPL"); +#if 0 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]; |