From: Arnd Bergmann <arnd@xxxxxxxx> SND_S3C_DMA_LEGACY can only be set on S3C24xx, which does not (yet) support the dmaengine framework, so samsung_dma_get_ops() fails to link if S3C24XX_DMA is disabled: sound/built-in.o: In function `dma_hw_params': :(.text+0x7f310): undefined reference to `s3c_dma_get_ops' sound/built-in.o: In function `s3c_ac97_trigger': :(.text+0x7f7f0): undefined reference to `s3c_dma_get_ops' sound/built-in.o: In function `s3c_ac97_mic_trigger': :(.text+0x7f884): undefined reference to `s3c_dma_get_ops' sound/built-in.o: In function `s3c2412_i2s_trigger': :(.text+0x80944): undefined reference to `s3c2410_dma_ctrl' This makes sure S3C24XX_DMA is always enabled when we need it, just like we do it for the same dependency in SND_S3C24XX_I2S, which has the same problem. Selecting "S3C2410_DMA" as we did before does not actually have the intended effect, since that one is only used on the s3c2410 and s3c2442 SoCs of the s3c24xx family, but not the others, so we can remove this from Kconfig. Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> Signed-off-by: Xia Kaixu <kaixu.xia@xxxxxxxxxx> Cc: Mark Brown <broonie@xxxxxxxxxx> Cc: Liam Girdwood <lgirdwood@xxxxxxxxx> Cc: Ben Dooks <ben-linux@xxxxxxxxx> Cc: Kukjin Kim <kgene.kim@xxxxxxxxxxx> Cc: Sangbeom Kim <sbkim73@xxxxxxxxxxx> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx Cc: linux-samsung-soc@xxxxxxxxxxxxxxx Cc: alsa-devel@xxxxxxxxxxxxxxxx --- sound/soc/samsung/Kconfig | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 99cc196..7b610a8 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -1,7 +1,6 @@ config SND_SOC_SAMSUNG tristate "ASoC support for Samsung" depends on PLAT_SAMSUNG - select S3C2410_DMA if ARCH_S3C24XX select S3C64XX_PL080 if ARCH_S3C64XX select SND_S3C_DMA if !ARCH_S3C24XX select SND_S3C_DMA_LEGACY if ARCH_S3C24XX @@ -15,11 +14,11 @@ config SND_S3C_DMA tristate config SND_S3C_DMA_LEGACY + select S3C24XX_DMA tristate config SND_S3C24XX_I2S tristate - select S3C24XX_DMA config SND_S3C_I2SV2_SOC tristate @@ -27,7 +26,6 @@ config SND_S3C_I2SV2_SOC config SND_S3C2412_SOC_I2S tristate select SND_S3C_I2SV2_SOC - select S3C2410_DMA config SND_SAMSUNG_PCM tristate @@ -83,7 +81,6 @@ config SND_SOC_SAMSUNG_SMDK_WM8994 config SND_SOC_SAMSUNG_SMDK2443_WM9710 tristate "SoC AC97 Audio support for SMDK2443 - WM9710" depends on SND_SOC_SAMSUNG && MACH_SMDK2443 - select S3C2410_DMA select AC97_BUS select SND_SOC_AC97_CODEC select SND_SAMSUNG_AC97 @@ -94,7 +91,6 @@ config SND_SOC_SAMSUNG_SMDK2443_WM9710 config SND_SOC_SAMSUNG_LN2440SBC_ALC650 tristate "SoC AC97 Audio support for LN2440SBC - ALC650" depends on SND_SOC_SAMSUNG && ARCH_S3C24XX - select S3C2410_DMA select AC97_BUS select SND_SOC_AC97_CODEC select SND_SAMSUNG_AC97 -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
 |