diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-12 00:43:32 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-12 00:43:32 -0400 |
| commit | b6ec995a21a9428aef620b5adf46d047a18d88b8 (patch) | |
| tree | 6719121e6605cbca524b687f47336b9bbf3b8d41 /drivers/media/video/bttv-cards.c | |
| parent | 3a5f8c5f788d68e325d9fe3c26f4df5a5aee838a (diff) | |
| parent | da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (diff) | |
Merge from Linus' tree
Diffstat (limited to 'drivers/media/video/bttv-cards.c')
| -rw-r--r-- | drivers/media/video/bttv-cards.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c index 190977a1e549..0881a17d5226 100644 --- a/drivers/media/video/bttv-cards.c +++ b/drivers/media/video/bttv-cards.c | |||
| @@ -2393,12 +2393,12 @@ struct tvcard bttv_tvcards[] = { | |||
| 2393 | .tuner = 0, | 2393 | .tuner = 0, |
| 2394 | .tuner_type = TUNER_LG_TDVS_H062F, | 2394 | .tuner_type = TUNER_LG_TDVS_H062F, |
| 2395 | .tuner_addr = ADDR_UNSET, | 2395 | .tuner_addr = ADDR_UNSET, |
| 2396 | .video_inputs = 2, | 2396 | .video_inputs = 3, |
| 2397 | .audio_inputs = 1, | 2397 | .audio_inputs = 1, |
| 2398 | .svhs = 2, | 2398 | .svhs = 2, |
| 2399 | .muxsel = { 2, 3 }, | 2399 | .muxsel = { 2, 3, 1 }, |
| 2400 | .gpiomask = 0x00e00007, | 2400 | .gpiomask = 0x00e00007, |
| 2401 | .audiomux = { 0x00400005, 0, 0, 0, 0, 0 }, | 2401 | .audiomux = { 0x00400005, 0, 0x00000001, 0, 0x00c00007, 0 }, |
| 2402 | .no_msp34xx = 1, | 2402 | .no_msp34xx = 1, |
| 2403 | .no_tda9875 = 1, | 2403 | .no_tda9875 = 1, |
| 2404 | .no_tda7432 = 1, | 2404 | .no_tda7432 = 1, |