---

yaml --- r: 182850 b: refs/heads/master c: c67d90f h: refs/heads/master v: v3
git-mirror · Jan 27, 2010 · 2514aee · 2514aee
1 parent 5ff7662
commit 2514aee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ec2963a8cd5fbc5f49dfa20c94229f1b46d1968
+refs/heads/master: c67d90ffd43a6cf18def21a0de7db56504d78295
diff --git a/trunk/sound/soc/s3c24xx/Kconfig b/trunk/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/trunk/sound/soc/s3c24xx/ln2440sbc_alc650.c b/trunk/sound/soc/s3c24xx/ln2440sbc_alc650.c
@@ -25,15 +25,15 @@
 
 #include "../codecs/ac97.h"
 #include "s3c-dma.h"
-#include "s3c24xx-ac97.h"
+#include "s3c-ac97.h"
 
 static struct snd_soc_card ln2440sbc;
 
 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,
 },
 };