summaryrefslogtreecommitdiff
path: root/drivers/media/video/zoran/zoran.h
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2009-01-12 19:09:46 +0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-29 13:35:38 +0300
commit17faeb20912af5d2a1422fdb606e785f9b1d88ba (patch)
tree9feb015ec6dfba0397208a7bd8e51ce5cba924ac /drivers/media/video/zoran/zoran.h
parent601139e08339b15997c6ae638dc5bf42c51ea204 (diff)
downloadlinux-17faeb20912af5d2a1422fdb606e785f9b1d88ba.tar.xz
V4L/DVB (10224): zoran: Use pci device table to get card type
Instead of using custom code, just let the device layer look it up for us from the pci device table. This requires extending the pci device table to list each known card, plus a catch-all entry for the cards that don't have sub-system vendor/device data. Improve some of the info and error messages too. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Acked-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/zoran/zoran.h')
-rw-r--r--drivers/media/video/zoran/zoran.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h
index 46b7ad477ceb..7273abf5eb46 100644
--- a/drivers/media/video/zoran/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
@@ -349,7 +349,6 @@ struct card_info {
u16 i2c_decoder, i2c_encoder; /* I2C types */
u16 video_vfe, video_codec; /* videocodec types */
u16 audio_chip; /* audio type */
- u16 vendor_id, device_id; /* subsystem vendor/device ID */
int inputs; /* number of video inputs */
struct input {