diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
| commit | 766d02786ecd22932beeb9ca8bad6d8c5a552ef9 (patch) | |
| tree | f6f2df0e35bbea914d1f4d12be6d02f128c73575 /drivers/media/common/tuners/mxl5005s.c | |
| parent | 906d882cacecd37ad2fdd03ed2a9b232bcb9507e (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'drivers/media/common/tuners/mxl5005s.c')
| -rw-r--r-- | drivers/media/common/tuners/mxl5005s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/tuners/mxl5005s.c b/drivers/media/common/tuners/mxl5005s.c index 5d05b5390f66..0dc2bef9f6a3 100644 --- a/drivers/media/common/tuners/mxl5005s.c +++ b/drivers/media/common/tuners/mxl5005s.c | |||
| @@ -101,7 +101,7 @@ enum { | |||
| 101 | MXL_QAM, | 101 | MXL_QAM, |
| 102 | MXL_ANALOG_CABLE, | 102 | MXL_ANALOG_CABLE, |
| 103 | MXL_ANALOG_OTA | 103 | MXL_ANALOG_OTA |
| 104 | } tuner_modu_type; | 104 | }; |
| 105 | 105 | ||
| 106 | /* MXL5005 Tuner Register Struct */ | 106 | /* MXL5005 Tuner Register Struct */ |
| 107 | struct TunerReg { | 107 | struct TunerReg { |
| @@ -194,7 +194,7 @@ enum { | |||
| 194 | RFSYN_DIVM, /* 88 */ | 194 | RFSYN_DIVM, /* 88 */ |
| 195 | DN_BYPASS_AGC_I2C /* 89 */ | 195 | DN_BYPASS_AGC_I2C /* 89 */ |
| 196 | #endif | 196 | #endif |
| 197 | } MXL5005_ControlName; | 197 | }; |
| 198 | 198 | ||
| 199 | /* | 199 | /* |
| 200 | * The following context is source code provided by MaxLinear. | 200 | * The following context is source code provided by MaxLinear. |