---

yaml --- r: 37326 b: refs/heads/master c: 5dbaa2c h: refs/heads/master v: v3
git-mirror · Sep 26, 2006 · 1f75086 · 1f75086
1 parent 4529cfa
commit 1f75086
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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);