diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 12:02:55 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 12:02:55 -0300 |
commit | 7540c1624e2e91cd608d60f7ceb6003df747152e (patch) | |
tree | 688db69a58fb13a083e1893fa0f9e0c9da2c20c5 /linux/Documentation | |
parent | 1537b0475bd1f694226d14373ed31298f2d0e8ef (diff) | |
parent | 1739deb9fa270e49dbcaa25a95796b4927cc4a78 (diff) | |
download | mediapointer-dvb-s2-7540c1624e2e91cd608d60f7ceb6003df747152e.tar.gz mediapointer-dvb-s2-7540c1624e2e91cd608d60f7ceb6003df747152e.tar.bz2 |
merge: http://linuxtv.org/hg/~dougsland/empire/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/Documentation')
-rw-r--r-- | linux/Documentation/video4linux/CARDLIST.em28xx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.em28xx b/linux/Documentation/video4linux/CARDLIST.em28xx index 084a7b624..66e5f8295 100644 --- a/linux/Documentation/video4linux/CARDLIST.em28xx +++ b/linux/Documentation/video4linux/CARDLIST.em28xx @@ -1,5 +1,5 @@ 0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800] - 1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883] + 1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883] 2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036] 3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208] 4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201] |