From 1f7508636e0d3456235a6529d006b57f971322fd Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Tue, 8 Aug 2006 09:10:04 -0300 Subject: [PATCH] --- yaml --- r: 37326 b: refs/heads/master c: 5dbaa2cb757545f8238319d55aa75cc8fabc8212 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/video4linux/CARDLIST.cx88 | 2 +- trunk/drivers/media/video/cx88/cx88-cards.c | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b085dd456c10..1d0fe29052f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad10c930e8857585cc316e96c15f02b42020bac6 +refs/heads/master: 5dbaa2cb757545f8238319d55aa75cc8fabc8212 diff --git a/trunk/Documentation/video4linux/CARDLIST.cx88 b/trunk/Documentation/video4linux/CARDLIST.cx88 index d9756d6111ab..d692a35ef1cc 100644 --- a/trunk/Documentation/video4linux/CARDLIST.cx88 +++ b/trunk/Documentation/video4linux/CARDLIST.cx88 @@ -10,7 +10,7 @@ 9 -> Leadtek PVR 2000 [107d:663b,107d:663C] 10 -> IODATA GV-VCP3/PCI [10fc:d003] 11 -> Prolink PlayTV PVR - 12 -> ASUS PVR-416 [1043:4823] + 12 -> ASUS PVR-416 [1043:4823,1461:c111] 13 -> MSI TV-@nywhere 14 -> KWorld/VStream XPert DVB-T [17de:08a6] 15 -> DViCO FusionHDTV DVB-T1 [18ac:db00] diff --git a/trunk/drivers/media/video/cx88/cx88-cards.c b/trunk/drivers/media/video/cx88/cx88-cards.c index 48a1f8aee679..afd50b465df7 100644 --- a/trunk/drivers/media/video/cx88/cx88-cards.c +++ b/trunk/drivers/media/video/cx88/cx88-cards.c @@ -1484,6 +1484,11 @@ struct cx88_subid cx88_subids[] = { .subvendor = 0x0070, .subdevice = 0x1404, .card = CX88_BOARD_HAUPPAUGE_HVR3000, + },{ + .subvendor = 0x1461, + .subdevice = 0xc111, /* AverMedia M150-D */ + /* This board is known to work with the ASUS PVR416 config */ + .card = CX88_BOARD_ASUS_PVR_416, }, }; const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);