summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-01-16 08:39:30 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-01-16 08:39:30 -0200
commitf87d09be8c2c270b83c2ad80d06206a7306e2fa9 (patch)
treed6e3f7e8ac8a6c567d800fb30e237eb788ac3edf /Documentation
parent4a8e4a270b89030bdeb09d2f8cef7cfe9a50e54d (diff)
parent21e2379b9ef705fcb3ba3be738decd3397fc30b7 (diff)
downloadlinux-3.10-f87d09be8c2c270b83c2ad80d06206a7306e2fa9.tar.gz
linux-3.10-f87d09be8c2c270b83c2ad80d06206a7306e2fa9.tar.bz2
linux-3.10-f87d09be8c2c270b83c2ad80d06206a7306e2fa9.zip
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/video4linux/CARDLIST.tuner1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner
index 0bf3d5bf9ef..f6d0cf7b792 100644
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
@@ -68,3 +68,4 @@ tuner=66 - LG NTSC (TALN mini series)
tuner=67 - Philips TD1316 Hybrid Tuner
tuner=68 - Philips TUV1236D ATSC/NTSC dual in
tuner=69 - Tena TNF 5335 MF
+tuner=70 - Samsung TCPN 2121P30A