aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/CARDLIST.cx238852
-rw-r--r--drivers/media/video/cx23885/cx23885-cards.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885
index 698971d23f4e..302c84f45edb 100644
--- a/Documentation/video4linux/CARDLIST.cx23885
+++ b/Documentation/video4linux/CARDLIST.cx23885
@@ -1,6 +1,6 @@
1 0 -> UNKNOWN/GENERIC [0070:3400] 1 0 -> UNKNOWN/GENERIC [0070:3400]
2 1 -> Hauppauge WinTV-HVR1800lp [0070:7600] 2 1 -> Hauppauge WinTV-HVR1800lp [0070:7600]
3 2 -> Hauppauge WinTV-HVR1800 [0070:7800,0070:7801] 3 2 -> Hauppauge WinTV-HVR1800 [0070:7800,0070:7801,0070:7809]
4 3 -> Hauppauge WinTV-HVR1250 [0070:7911] 4 3 -> Hauppauge WinTV-HVR1250 [0070:7911]
5 4 -> DViCO FusionHDTV5 Express [18ac:d500] 5 4 -> DViCO FusionHDTV5 Express [18ac:d500]
6 5 -> Hauppauge WinTV-HVR1500Q [0070:7797] 6 5 -> Hauppauge WinTV-HVR1500Q [0070:7797]
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index fbf93c63dcaa..3ddcab305778 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -146,6 +146,10 @@ struct cx23885_subid cx23885_subids[] = {
146 .card = CX23885_BOARD_HAUPPAUGE_HVR1800, 146 .card = CX23885_BOARD_HAUPPAUGE_HVR1800,
147 },{ 147 },{
148 .subvendor = 0x0070, 148 .subvendor = 0x0070,
149 .subdevice = 0x7809,
150 .card = CX23885_BOARD_HAUPPAUGE_HVR1800,
151 },{
152 .subvendor = 0x0070,
149 .subdevice = 0x7911, 153 .subdevice = 0x7911,
150 .card = CX23885_BOARD_HAUPPAUGE_HVR1250, 154 .card = CX23885_BOARD_HAUPPAUGE_HVR1250,
151 },{ 155 },{