ASoC: Ux500: remove test for undefined Kconfig macro
authorPaul Bolle <pebolle@tiscali.nl>
Fri, 29 Mar 2013 12:28:21 +0000 (13:28 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 8 Apr 2013 12:44:32 +0000 (13:44 +0100)
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>
sound/soc/ux500/ux500_msp_dai.h

index 9c778d9c383804cf998f40ce212bd3b6915b0634..f53104359f15585ac13591d681e70e50ce7f9184 100644 (file)
 #define FRAME_PER_8_SLOTS                              138
 #define FRAME_PER_16_SLOTS                             277
 
-#ifndef CONFIG_SND_SOC_UX500_AB5500
 #define UX500_MSP_INTERNAL_CLOCK_FREQ  40000000
 #define UX500_MSP1_INTERNAL_CLOCK_FREQ UX500_MSP_INTERNAL_CLOCK_FREQ
-#else
-#define UX500_MSP_INTERNAL_CLOCK_FREQ 13000000
-#define UX500_MSP1_INTERNAL_CLOCK_FREQ (UX500_MSP_INTERNAL_CLOCK_FREQ * 2)
-#endif
 
 #define UX500_MSP_MIN_CHANNELS         1
 #define UX500_MSP_MAX_CHANNELS         8