aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-09-09 16:03:52 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 16:57:51 -0400
commit10c35cf8fd89e166d13bc93175f2b05d9cb85e07 (patch)
tree08947740ac556faa9acf8458a94daccb4267f567 /drivers/media/video/saa7134/saa7134-cards.c
parent4279f02478c2c4f106ec9efb80ca152e8d406844 (diff)
[PATCH] v4l: cx88-dvb incorrect reporting fixed and remove bad PCI ID for Sabrent
- cx88-dvb has been incorrectly reporting the card name instead of frontend name - Removes a bad PCI subsystem ID for saa713x Sabrent card - Renames DVICO --> DViCO for bttv. - #include <linux/config.h> no longer needed. Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index f991f2325340..07d3ee0ada7d 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2380,12 +2380,6 @@ struct pci_device_id saa7134_pci_tbl[] = {
2380 .driver_data = SAA7134_BOARD_VIDEOMATE_TV_PVR, 2380 .driver_data = SAA7134_BOARD_VIDEOMATE_TV_PVR,
2381 },{ 2381 },{
2382 .vendor = PCI_VENDOR_ID_PHILIPS, 2382 .vendor = PCI_VENDOR_ID_PHILIPS,
2383 .device = PCI_DEVICE_ID_PHILIPS_SAA7130,
2384 .subvendor = 0x1131,
2385 .subdevice = 0,
2386 .driver_data = SAA7134_BOARD_SABRENT_SBTTVFM,
2387 },{
2388 .vendor = PCI_VENDOR_ID_PHILIPS,
2389 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 2383 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
2390 .subvendor = 0x1461, /* Avermedia Technologies Inc */ 2384 .subvendor = 0x1461, /* Avermedia Technologies Inc */
2391 .subdevice = 0x9715, 2385 .subdevice = 0x9715,