aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-15 11:52:43 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-15 11:52:43 +0100
commit37cfa1950e2a24d9fa4a593186645d8e2b5042a8 (patch)
tree9d8c9485850ba506f6cdea15bff83652d6b6ca28 /sound/soc/codecs/Kconfig
parent29e02cb3ffda6ef48a50fea880f63ac8178308bb (diff)
parent25cbf465207e9616e9b7d362ee166abf296d4c1e (diff)
downloadmrst-s0i3-test-37cfa1950e2a24d9fa4a593186645d8e2b5042a8.tar.gz
mrst-s0i3-test-37cfa1950e2a24d9fa4a593186645d8e2b5042a8.tar.xz
mrst-s0i3-test-37cfa1950e2a24d9fa4a593186645d8e2b5042a8.zip
Merge branch 'wm8974-upstream' into for-2.6.32
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r--sound/soc/codecs/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 910b9162cbb..167a5ce06cd 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -46,6 +46,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_WM8960 if I2C
select SND_SOC_WM8961 if I2C
select SND_SOC_WM8971 if I2C
+ select SND_SOC_WM8974 if I2C
select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI
select SND_SOC_WM8990 if I2C
select SND_SOC_WM8993 if I2C
@@ -188,6 +189,9 @@ config SND_SOC_WM8961
config SND_SOC_WM8971
tristate
+config SND_SOC_WM8974
+ tristate
+
config SND_SOC_WM8988
tristate