diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-09-02 14:18:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-09-02 14:18:16 +1000 |
| commit | 582f1f8c77b90e784a71894905b1267bfadd0f9a (patch) | |
| tree | 7c0d5ed8761c4708e3dd9c526d732f84a22c5ac4 /Documentation/video4linux/CARDLIST.tuner | |
| parent | c1598e6a48726836f104579c898c3ce0def49ed3 (diff) | |
| parent | 3ce4edc86910648d6b55eb7532165f9db528b305 (diff) | |
Merge commit 'v4l-dvb/stable'
Conflicts:
drivers/media/radio/dsbr100.c
drivers/media/video/zr364xx.c
Diffstat (limited to 'Documentation/video4linux/CARDLIST.tuner')
| -rw-r--r-- | Documentation/video4linux/CARDLIST.tuner | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner index 0e2394695bb8..30bbdda68d03 100644 --- a/Documentation/video4linux/CARDLIST.tuner +++ b/Documentation/video4linux/CARDLIST.tuner @@ -74,3 +74,4 @@ tuner=72 - Thomson FE6600 tuner=73 - Samsung TCPG 6121P30A tuner=75 - Philips TEA5761 FM Radio tuner=76 - Xceive 5000 tuner +tuner=77 - TCL tuner MF02GIP-5N-E |