Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 270739
b: refs/heads/master
c: 61e49bf
h: refs/heads/master
i:
  270737: c3baca4
  270735: b3c62d3
v: v3
  • Loading branch information
Arnd Bergmann authored and Mark Brown committed Oct 3, 2011
1 parent 5f2b155 commit 4768419
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9b5999b1bc74aea2a515701f937d7ad3e17f10e4
refs/heads/master: 61e49bf1941050e85035e139c6f9eace60c72e70
6 changes: 6 additions & 0 deletions trunk/sound/soc/samsung/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ config SND_SOC_SAMSUNG_SMDK_WM8580
config SND_SOC_SAMSUNG_SMDK_WM8994
tristate "SoC I2S Audio support for WM8994 on SMDK"
depends on SND_SOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210 || MACH_SMDK4212)
depends on I2C=y && GENERIC_HARDIRQS
select MFD_WM8994
select SND_SOC_WM8994
select SND_SAMSUNG_I2S
help
Expand Down Expand Up @@ -150,7 +152,9 @@ config SND_SOC_SMARTQ
config SND_SOC_GONI_AQUILA_WM8994
tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"
depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA)
depends on I2C=y && GENERIC_HARDIRQS
select SND_SAMSUNG_I2S
select MFD_WM8994
select SND_SOC_WM8994
help
Say Y if you want to add support for SoC audio on goni or aquila
Expand All @@ -174,6 +178,8 @@ config SND_SOC_SMDK_WM8580_PCM
config SND_SOC_SMDK_WM8994_PCM
tristate "SoC PCM Audio support for WM8994 on SMDK"
depends on SND_SOC_SAMSUNG && (MACH_SMDKC210 || MACH_SMDKV310 || MACH_SMDK4212)
depends on I2C=y && GENERIC_HARDIRQS
select MFD_WM8994
select SND_SOC_WM8994
select SND_SAMSUNG_PCM
help
Expand Down

0 comments on commit 4768419

Please sign in to comment.