diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-12 01:20:30 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-12 01:20:30 -0500 |
| commit | 2f55eaab56ea083498034c18e09d356594081fca (patch) | |
| tree | 41563dd4dfe981514915dfcf57e5a5b298c82b6a /sound/soc/codecs/Kconfig | |
| parent | 03cfbdf9f7a1d392146718f67e50fa9ab2844f22 (diff) | |
| parent | 559a8cd629f1b797732fd97afd58b41d8b6fb312 (diff) | |
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 054191ed08ef..883a312bb293 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -167,6 +167,9 @@ config SND_SOC_L3 | |||
| 167 | config SND_SOC_DA7210 | 167 | config SND_SOC_DA7210 |
| 168 | tristate | 168 | tristate |
| 169 | 169 | ||
| 170 | config SND_SOC_DMIC | ||
| 171 | tristate | ||
| 172 | |||
| 170 | config SND_SOC_MAX98088 | 173 | config SND_SOC_MAX98088 |
| 171 | tristate | 174 | tristate |
| 172 | 175 | ||