aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-08-08 08:10:04 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 10:53:17 -0400
commit5dbaa2cb757545f8238319d55aa75cc8fabc8212 (patch)
tree36f863178a58a892f29bb2edd2e4be0ac1f08dc3
parentad10c930e8857585cc316e96c15f02b42020bac6 (diff)
V4L/DVB (4360): Cx88: add autodetection support for AverMedia M150-D
This patch adds autodetection support for the AverMedia M150-D blackbird MPEG encoder / analog video capture card. This board is known to work with the ASUS PVR 416 configuration. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--Documentation/video4linux/CARDLIST.cx882
-rw-r--r--drivers/media/video/cx88/cx88-cards.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index d9756d6111ab..d692a35ef1cc 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -10,7 +10,7 @@
10 9 -> Leadtek PVR 2000 [107d:663b,107d:663C] 10 9 -> Leadtek PVR 2000 [107d:663b,107d:663C]
11 10 -> IODATA GV-VCP3/PCI [10fc:d003] 11 10 -> IODATA GV-VCP3/PCI [10fc:d003]
12 11 -> Prolink PlayTV PVR 12 11 -> Prolink PlayTV PVR
13 12 -> ASUS PVR-416 [1043:4823] 13 12 -> ASUS PVR-416 [1043:4823,1461:c111]
14 13 -> MSI TV-@nywhere 14 13 -> MSI TV-@nywhere
15 14 -> KWorld/VStream XPert DVB-T [17de:08a6] 15 14 -> KWorld/VStream XPert DVB-T [17de:08a6]
16 15 -> DViCO FusionHDTV DVB-T1 [18ac:db00] 16 15 -> DViCO FusionHDTV DVB-T1 [18ac:db00]
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 48a1f8aee679..afd50b465df7 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1484,6 +1484,11 @@ struct cx88_subid cx88_subids[] = {
1484 .subvendor = 0x0070, 1484 .subvendor = 0x0070,
1485 .subdevice = 0x1404, 1485 .subdevice = 0x1404,
1486 .card = CX88_BOARD_HAUPPAUGE_HVR3000, 1486 .card = CX88_BOARD_HAUPPAUGE_HVR3000,
1487 },{
1488 .subvendor = 0x1461,
1489 .subdevice = 0xc111, /* AverMedia M150-D */
1490 /* This board is known to work with the ASUS PVR416 config */
1491 .card = CX88_BOARD_ASUS_PVR_416,
1487 }, 1492 },
1488}; 1493};
1489const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); 1494const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);