summary refs log tree commit diff
path: root/Documentation/video4linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 14:58:58 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 18:07:50 -0300
commit10ac6603613d46a43a4544fbbe9581e50879bd45 (patch)
tree857987542eb360626689190c0cc519c395e0e6ad /Documentation/video4linux
parentd3603341e2f3c39f017f8df4b1cd734aeb0d453b (diff)
downloadlinux-10ac6603613d46a43a4544fbbe9581e50879bd45.tar.gz
V4L/DVB (8541): em28xx: HVR-950 entry is duplicated.
Thanks to "Devin Heitmueller" <devin.heitmueller@gmail.com> for pointing this
issue.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'Documentation/video4linux')
-rw-r--r--Documentation/video4linux/CARDLIST.em28xx5
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index 57dfb2340181..89c7f32abf9f 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -14,7 +14,7 @@
  13 -> Terratec Prodigy XS                      (em2880)        [0ccd:0047]
  14 -> Pixelview Prolink PlayTV USB 2.0         (em2820/em2840)
  15 -> V-Gear PocketTV                          (em2800)
- 16 -> Hauppauge WinTV HVR 950                  (em2880)        [2040:6513,2040:6517,2040:651b,2040:651f]
+ 16 -> Hauppauge WinTV HVR 950                  (em2883)        [2040:6513,2040:6517,2040:651b,2040:651f]
  17 -> Pinnacle PCTV HD Pro Stick               (em2880)        [2304:0227]
  18 -> Hauppauge WinTV HVR 900 (R2)             (em2880)        [2040:6502]
  19 -> PointNix Intra-Oral Camera               (em2860)
@@ -56,5 +56,4 @@
  55 -> Terratec Hybrid XS (em2882)              (em2882)        [0ccd:005e]
  56 -> Pinnacle Hybrid Pro (2)                  (em2882)        [2304:0226]
  57 -> Kworld PlusTV HD Hybrid 330              (em2883)        [eb1a:a316]
- 58 -> Hauppauge WinTV HVR 950                  (em2883)
- 59 -> Compro VideoMate ForYou/Stereo           (em2820/em2840) [185b:2041]
+ 58 -> Compro VideoMate ForYou/Stereo           (em2820/em2840) [185b:2041]