---

yaml --- r: 206514 b: refs/heads/master c: 3dedece h: refs/heads/master v: v3
git-mirror · May 27, 2010 · e550607 · e550607
1 parent 4a5e606
commit e550607
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 021f80cc701a31c0962de7f1cc96b16309140b1f
+refs/heads/master: 3dedece4a5ebad4db43e72ba9b2236ff01bc4271
diff --git a/trunk/sound/soc/s3c24xx/Kconfig b/trunk/sound/soc/s3c24xx/Kconfig
@@ -1,6 +1,6 @@
 config SND_S3C24XX_SOC
 	tristate "SoC Audio for the Samsung S3CXXXX chips"
-	depends on ARCH_S3C2410 || ARCH_S3C64XX
+	depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100
 	select S3C64XX_DMA if ARCH_S3C64XX
 	help
 	  Say Y or M if you want to add support for codecs attached to
@@ -120,7 +120,7 @@ config SND_S3C24XX_SOC_SIMTEC_HERMES
 
 config SND_SOC_SMDK_WM9713
 	tristate "SoC AC97 Audio support for SMDK with WM9713"
-	depends on SND_S3C24XX_SOC && MACH_SMDK6410
+	depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100)
 	select SND_SOC_WM9713
 	select SND_S3C_SOC_AC97
 	help

diff --git a/trunk/sound/soc/s3c24xx/smdk_wm9713.c b/trunk/sound/soc/s3c24xx/smdk_wm9713.c
@@ -25,6 +25,7 @@ static struct snd_soc_card smdk;
  * Default CFG switch settings to use this driver:
  *
  *   SMDK6410: Set CFG1 1-3 On, CFG2 1-4 Off
+ *   SMDKC100: Set CFG6 1-3 On, CFG7 1   On
  */
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ static struct snd_soc_card smdk; @@
      * Default CFG switch settings to use this driver:
      *
      *   SMDK6410: Set CFG1 1-3 On, CFG2 1-4 Off
+     *   SMDKC100: Set CFG6 1-3 On, CFG7 1   On
      */
     /*
@@ Expand Down @@