aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-13 13:58:23 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-13 13:58:23 +0000
commit3e8e2cc45c9d6b5c1265838a8cff701815321dbc (patch)
tree708e85b74bac0427389d6f41e04522dfced1773c /sound/soc/codecs/Kconfig
parenta193436c5d52e8398af22462beaa03407fa89b2e (diff)
parent7bd1fd8a96098b84664acdca5361defaf1e6ce9f (diff)
downloadkernel_samsung_smdk4412-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.zip
kernel_samsung_smdk4412-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.tar.gz
kernel_samsung_smdk4412-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.tar.bz2
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r--sound/soc/codecs/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index fa42be5..61e36ef 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -168,6 +168,9 @@ config SND_SOC_L3
config SND_SOC_DA7210
tristate
+config SND_SOC_DMIC
+ tristate
+
config SND_SOC_MAX98088
tristate