ASoC: AC97: LN2440SBC: Switch to s3c-ac97.c

Switch to use s3c-ac97.c AC97 controller driver.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
index 8b62798a04b831a2b04d14da3203504ee9055eb1..69d143e3ab250484503db97c6b1ba252baecd114 100644 (file)
--- a/sound/soc/s3c24xx/Kconfig
+++ b/sound/soc/s3c24xx/Kconfig
@@ -29,9 +29,6 @@ config SND_S3C_SOC_PCM
 
 config SND_S3C2443_SOC_AC97
        tristate
-       select S3C2410_DMA
-       select AC97_BUS
-       select SND_SOC_AC97_BUS
 
 config SND_S3C_SOC_AC97
        tristate
@@ -86,8 +83,10 @@ config SND_S3C24XX_SOC_SMDK2443_WM9710
 config SND_S3C24XX_SOC_LN2440SBC_ALC650
        tristate "SoC AC97 Audio support for LN2440SBC - ALC650"
        depends on SND_S3C24XX_SOC && ARCH_S3C2410
-       select SND_S3C2443_SOC_AC97
+       select S3C2410_DMA
+       select AC97_BUS
        select SND_SOC_AC97_CODEC
+       select SND_S3C_SOC_AC97
        help
          Say Y if you want to add support for SoC audio on ln2440sbc
          with the ALC650.

diff --git a/sound/soc/s3c24xx/ln2440sbc_alc650.c b/sound/soc/s3c24xx/ln2440sbc_alc650.c
index d00d359a03e6fd8b30631051b2169474a8a6327f..ffa954fe6931bea522fb02360b8f4877524884bb 100644 (file)
--- a/sound/soc/s3c24xx/ln2440sbc_alc650.c
+++ b/sound/soc/s3c24xx/ln2440sbc_alc650.c
@@ -25,7 +25,7 @@
 
 #include "../codecs/ac97.h"
 #include "s3c-dma.h"
-#include "s3c24xx-ac97.h"
+#include "s3c-ac97.h"
 
 static struct snd_soc_card ln2440sbc;
 
@@ -33,7 +33,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = {
 {
        .name = "AC97",
        .stream_name = "AC97 HiFi",
-       .cpu_dai = &s3c2443_ac97_dai[0],
+       .cpu_dai = &s3c_ac97_dai[S3C_AC97_DAI_PCM],
        .codec_dai = &ac97_dai,
 },
 };