diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-15 09:50:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-15 09:50:41 +0100 |
| commit | 39dc78b6510323848e3356452f7dab9499736978 (patch) | |
| tree | cf8a8fede74e41b203fd00e3ccd21ead2e851442 /drivers/media/video/saa7134/saa7134-cards.c | |
| parent | 4c49b12853fbb5eff4849b7b6a1e895776f027a1 (diff) | |
| parent | 156171c71a0dc4bce12b4408bb1591f8fe32dc1a (diff) | |
| download | linux-39dc78b6510323848e3356452f7dab9499736978.tar.gz linux-39dc78b6510323848e3356452f7dab9499736978.tar.bz2 linux-39dc78b6510323848e3356452f7dab9499736978.zip | |
Merge commit 'v2.6.32-rc7' into perf/core
Merge reason: pick up perf fixlets
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 71145bff94fa..09013229d4aa 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c @@ -3428,6 +3428,7 @@ struct saa7134_board saa7134_boards[] = { .tuner_config = 3, .mpeg = SAA7134_MPEG_DVB, .ts_type = SAA7134_MPEG_TS_SERIAL, + .ts_force_val = 1, .gpiomask = 0x0800100, /* GPIO 21 is an INPUT */ .inputs = {{ .name = name_tv, |