summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorAron Szabo <aron@aron.ws>2008-07-27 18:47:52 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 19:22:50 +0200
commit59d07f1b705c466ea4eaca9c43d46be6d6a065a4 (patch)
treecb1f72c43ced83d13cfe53ebaa67d7a2585b5fe8 /Documentation
parentMerge ../linux-2.6 (diff)
downloadlinux-59d07f1b705c466ea4eaca9c43d46be6d6a065a4.tar.xz
linux-59d07f1b705c466ea4eaca9c43d46be6d6a065a4.zip
V4L/DVB (8538): em28xx-cards: Add GrabBeeX+ USB2800 model
Added GrabBeeX+ USB2800 model (analog only) [mchehab@infradead.org: Need to fix some merge conflicts] Signed-off-by: Aron Szabo <aron@aron.ws> Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/video4linux/CARDLIST.em28xx1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index ef0c3ddacae6..42be129609b7 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -19,3 +19,4 @@
18 -> Hauppauge WinTV HVR 900 (R2) (em2880) [2040:6502]
19 -> PointNix Intra-Oral Camera (em2860)
20 -> AMD ATI TV Wonder HD 600 (em2880) [0438:b002]
+ 21 -> eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800) [eb1a:2801]