Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206515
b: refs/heads/master
c: ce1f7d3
h: refs/heads/master
i:
  206513: 4a5e606
  206511: 2344d71
v: v3
  • Loading branch information
Jassi Brar authored and Mark Brown committed May 27, 2010
1 parent e550607 commit d752b8d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3dedece4a5ebad4db43e72ba9b2236ff01bc4271
refs/heads/master: ce1f7d30766f6549db6fa0b9e595e0d26a5b7d9a
4 changes: 2 additions & 2 deletions trunk/sound/soc/s3c24xx/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
config SND_S3C24XX_SOC
tristate "SoC Audio for the Samsung S3CXXXX chips"
depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100
depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210
select S3C64XX_DMA if ARCH_S3C64XX
help
Say Y or M if you want to add support for codecs attached to
Expand Down Expand Up @@ -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 || MACH_SMDKC100)
depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110)
select SND_SOC_WM9713
select SND_S3C_SOC_AC97
help
Expand Down
2 changes: 2 additions & 0 deletions trunk/sound/soc/s3c24xx/smdk_wm9713.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ static struct snd_soc_card smdk;
*
* SMDK6410: Set CFG1 1-3 On, CFG2 1-4 Off
* SMDKC100: Set CFG6 1-3 On, CFG7 1 On
* SMDKC110: Set CFGB10 1-2 Off, CFGB12 1-3 On
* SMDKV210: Set CFGB10 1-2 Off, CFGB12 1-3 On
*/

/*
Expand Down

0 comments on commit d752b8d

Please sign in to comment.