Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353409
b: refs/heads/master
c: 313367e
h: refs/heads/master
i:
  353407: a731ec7
v: v3
  • Loading branch information
Padmavathi Venna authored and Mark Brown committed Jan 29, 2013
1 parent 3cb7cde commit 26865af
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: a4a8a9d3aee357d8f34060c2fee711d2a9df3709
refs/heads/master: 313367e7bfa9de924245ad65c83c32c073b2fdfc
6 changes: 3 additions & 3 deletions trunk/sound/soc/samsung/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ 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 SND_SOC_SAMSUNG
depends on I2C=y && GENERIC_HARDIRQS
select MFD_WM8994
select SND_SOC_WM8994
Expand Down Expand Up @@ -162,7 +162,7 @@ config SND_SOC_GONI_AQUILA_WM8994

config SND_SOC_SAMSUNG_SMDK_SPDIF
tristate "SoC S/PDIF Audio support for SMDK"
depends on SND_SOC_SAMSUNG && (MACH_SMDKC100 || MACH_SMDKC110 || MACH_SMDKV210 || MACH_SMDKV310 || MACH_SMDK4212)
depends on SND_SOC_SAMSUNG
select SND_SAMSUNG_SPDIF
help
Say Y if you want to add support for SoC S/PDIF audio on the SMDK.
Expand All @@ -177,7 +177,7 @@ 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 SND_SOC_SAMSUNG
depends on I2C=y && GENERIC_HARDIRQS
select MFD_WM8994
select SND_SOC_WM8994
Expand Down

0 comments on commit 26865af

Please sign in to comment.