Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / Documentation / video4linux / CARDLIST.bttv

diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index d97cf7cc60889e637f2772023e752fda4d44c5a3..60ba66836038215952c9be46dcbff58edb19b319 100644 (file)
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
@@ -148,3 +148,6 @@
 147 -> VoodooTV 200 (USA)                                  [121a:3000]
 148 -> DViCO FusionHDTV 2                                  [dbc0:d200]
 149 -> Typhoon TV-Tuner PCI (50684)
+150 -> Geovision GV-600                                    [008a:763c]
+151 -> Kozumi KTV-01C
+152 -> Encore ENL TV-FM-2                                  [1000:1801]