diff options
author | Paul Bolle <pebolle@tiscali.nl> | 2013-03-29 08:28:21 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-08 08:44:32 -0400 |
commit | 4f88eff834361d20f507757dde7e636fe2ca0a04 (patch) | |
tree | 2397a173ecc9958264df5262855dabd30cbe649a | |
parent | 31880c37c11e28cb81c70757e38392b42e695dc6 (diff) |
ASoC: Ux500: remove test for undefined Kconfig macro
A test for CONFIG_SND_SOC_UX500_AB5500 was added in v3.5. But there
never was a corresponding Kconfig symbol so this test has always
evaluated to true. And since AB5500 support was removed in v3.5 it
appears safe to remove this test and a few lines of code.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/ux500/ux500_msp_dai.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.h b/sound/soc/ux500/ux500_msp_dai.h index 9c778d9c3838..f53104359f15 100644 --- a/sound/soc/ux500/ux500_msp_dai.h +++ b/sound/soc/ux500/ux500_msp_dai.h | |||
@@ -35,13 +35,8 @@ | |||
35 | #define FRAME_PER_8_SLOTS 138 | 35 | #define FRAME_PER_8_SLOTS 138 |
36 | #define FRAME_PER_16_SLOTS 277 | 36 | #define FRAME_PER_16_SLOTS 277 |
37 | 37 | ||
38 | #ifndef CONFIG_SND_SOC_UX500_AB5500 | ||
39 | #define UX500_MSP_INTERNAL_CLOCK_FREQ 40000000 | 38 | #define UX500_MSP_INTERNAL_CLOCK_FREQ 40000000 |
40 | #define UX500_MSP1_INTERNAL_CLOCK_FREQ UX500_MSP_INTERNAL_CLOCK_FREQ | 39 | #define UX500_MSP1_INTERNAL_CLOCK_FREQ UX500_MSP_INTERNAL_CLOCK_FREQ |
41 | #else | ||
42 | #define UX500_MSP_INTERNAL_CLOCK_FREQ 13000000 | ||
43 | #define UX500_MSP1_INTERNAL_CLOCK_FREQ (UX500_MSP_INTERNAL_CLOCK_FREQ * 2) | ||
44 | #endif | ||
45 | 40 | ||
46 | #define UX500_MSP_MIN_CHANNELS 1 | 41 | #define UX500_MSP_MIN_CHANNELS 1 |
47 | #define UX500_MSP_MAX_CHANNELS 8 | 42 | #define UX500_MSP_MAX_CHANNELS 8 |