diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /drivers/media/dvb/b2c2/flexcop-fe-tuner.c | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'drivers/media/dvb/b2c2/flexcop-fe-tuner.c')
| -rw-r--r-- | drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c index 4eed783f4bce..a127a4175c40 100644 --- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c +++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c | |||
| @@ -491,6 +491,7 @@ static struct s5h1420_config skystar2_rev2_7_s5h1420_config = { | |||
| 491 | .demod_address = 0x53, | 491 | .demod_address = 0x53, |
| 492 | .invert = 1, | 492 | .invert = 1, |
| 493 | .repeated_start_workaround = 1, | 493 | .repeated_start_workaround = 1, |
| 494 | .serial_mpeg = 1, | ||
| 494 | }; | 495 | }; |
| 495 | 496 | ||
| 496 | static struct itd1000_config skystar2_rev2_7_itd1000_config = { | 497 | static struct itd1000_config skystar2_rev2_7_itd1000_config = { |