aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-16 23:20:01 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-16 23:20:01 -0800
commitd669af9d5afb5bdb629f78d024b35e507465f570 (patch)
tree711ab23d69098fa05973b69efbd0ae61cc7ff927 /Documentation
parent2ddb55f091a9c74a297d72b50f8310c0c8ed7d1d (diff)
parentf87d09be8c2c270b83c2ad80d06206a7306e2fa9 (diff)
Merge 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