Merge branch 'master'

[linux-2.6] / Documentation / video4linux / CARDLIST.bttv

diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index dd7b565be69d56b9f5b43e0cbea3eee8fd16e627..2404099996ac40d83a6e5512eb98498749c5bc83 100644 (file)
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
@@ -137,3 +137,6 @@
 136 -> Acorp Y878F                                         [9511:1540]
 137 -> Conceptronic CTVFMi v2
 138 -> Prolink Pixelview PV-BT878P+ (Rev.2E)
+139 -> Prolink PixelView PlayTV MPEG2 PV-M4900
+140 -> Osprey 440                                          [0070:ff07]
+141 -> Asound Skyeye PCTV