diff options
| -rw-r--r-- | sound/soc/codecs/rt298.c | 1 | ||||
| -rw-r--r-- | sound/soc/ti/Kconfig | 5 | ||||
| -rw-r--r-- | sound/soc/ti/ams-delta.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index 8fbd25ad9b47..ad3783ade1b5 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -789,7 +789,6 @@ static int rt298_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - d_len_code = 0; switch (params_width(params)) { /* bit 6:4 Bits per Sample */ case 16: diff --git a/sound/soc/ti/Kconfig b/sound/soc/ti/Kconfig index 593be22503b5..e22e41af3226 100644 --- a/sound/soc/ti/Kconfig +++ b/sound/soc/ti/Kconfig @@ -125,8 +125,9 @@ config SND_SOC_OMAP_ABE_TWL6040 config SND_SOC_OMAP_AMS_DELTA tristate "SoC Audio support for Amstrad E3 (Delta) videophone" - depends on MACH_AMS_DELTA && TTY - select SND_SOC_OMAP_MCBSP + depends on MACH_AMS_DELTA || COMPILE_TEST + depends on TTY + select SND_SOC_OMAP_MCBSP if COMMON_CLK select SND_SOC_CX20442 help Say Y or M if you want to add support for SoC audio device diff --git a/sound/soc/ti/ams-delta.c b/sound/soc/ti/ams-delta.c index 9c2cd993763a..b32cc03dc1c2 100644 --- a/sound/soc/ti/ams-delta.c +++ b/sound/soc/ti/ams-delta.c @@ -16,8 +16,6 @@ #include <sound/soc.h> #include <sound/jack.h> -#include <asm/mach-types.h> - #include <linux/platform_data/asoc-ti-mcbsp.h> #include "omap-mcbsp.h" |