aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>2008-06-28 00:45:26 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:12:53 -0400
commitbfda3a0b3276cda7f2da1dcd98bd060b60954cbb (patch)
treea8e7f572f6fd361efa5bbdb3d089187b16196051
parenta9fc52bcbeb5245b58d23c558f3e3e8f18bebbc3 (diff)
V4L/DVB (8124): Add LifeVideo To-Go Cardbus PCI ID
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--Documentation/video4linux/CARDLIST.saa71342
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 4c8a86f24dbe..f58192276017 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -37,7 +37,7 @@
37 36 -> UPMOST PURPLE TV [12ab:0800] 37 36 -> UPMOST PURPLE TV [12ab:0800]
38 37 -> Items MuchTV Plus / IT-005 38 37 -> Items MuchTV Plus / IT-005
39 38 -> Terratec Cinergy 200 TV [153b:1152] 39 38 -> Terratec Cinergy 200 TV [153b:1152]
40 39 -> LifeView FlyTV Platinum Mini [5168:0212,4e42:0212] 40 39 -> LifeView FlyTV Platinum Mini [5168:0212,4e42:0212,5169:1502]
41 40 -> Compro VideoMate TV PVR/FM [185b:c100] 41 40 -> Compro VideoMate TV PVR/FM [185b:c100]
42 41 -> Compro VideoMate TV Gold+ [185b:c100] 42 41 -> Compro VideoMate TV Gold+ [185b:c100]
43 42 -> Sabrent SBT-TVFM (saa7130) 43 42 -> Sabrent SBT-TVFM (saa7130)
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index a37e5c64f44b..348c8635f19f 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -5371,6 +5371,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
5371 }, { 5371 }, {
5372 .vendor = PCI_VENDOR_ID_PHILIPS, 5372 .vendor = PCI_VENDOR_ID_PHILIPS,
5373 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 5373 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5374 .subvendor = 0x5169,
5375 .subdevice = 0x1502,
5376 .driver_data = SAA7134_BOARD_FLYTVPLATINUM_MINI,
5377 }, {
5378 .vendor = PCI_VENDOR_ID_PHILIPS,
5379 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5374 .subvendor = 0x5ace, 5380 .subvendor = 0x5ace,
5375 .subdevice = 0x6290, 5381 .subdevice = 0x6290,
5376 .driver_data = SAA7134_BOARD_BEHOLD_H6, 5382 .driver_data = SAA7134_BOARD_BEHOLD_H6,