Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

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

diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index 74fb085e178b9da6c37cd3efa0224626665ec371..b72706c58a442bdb744fb34f74340b1de0337b29 100644 (file)
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
@@ -142,3 +142,4 @@
 141 -> Asound Skyeye PCTV
 142 -> Sabrent TV-FM (bttv version)
 143 -> Hauppauge ImpactVCB (bt878)                         [0070:13eb]
+144 -> MagicTV