diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
| commit | 75d8f2931a803b803cb4a850448460475c20f30b (patch) | |
| tree | 9853b9084fa55609c8e4abbc1763bc500e05da50 /sound/soc/mxs | |
| parent | ffb690d5aa36d38d7bed7579e3f07b84ff6b3a08 (diff) | |
| parent | e93c7d1bc350189511d32cec2f0af79c30e7fa47 (diff) | |
Merge branch 'asoc-omap' into for-3.7
Diffstat (limited to 'sound/soc/mxs')
| -rw-r--r-- | sound/soc/mxs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig index 99a997f19bb9..b6fa77678d97 100644 --- a/sound/soc/mxs/Kconfig +++ b/sound/soc/mxs/Kconfig | |||
| @@ -10,7 +10,7 @@ menuconfig SND_MXS_SOC | |||
| 10 | if SND_MXS_SOC | 10 | if SND_MXS_SOC |
| 11 | 11 | ||
| 12 | config SND_SOC_MXS_SGTL5000 | 12 | config SND_SOC_MXS_SGTL5000 |
| 13 | tristate "SoC Audio support for i.MX boards with sgtl5000" | 13 | tristate "SoC Audio support for MXS boards with sgtl5000" |
| 14 | depends on I2C | 14 | depends on I2C |
| 15 | select SND_SOC_SGTL5000 | 15 | select SND_SOC_SGTL5000 |
| 16 | help | 16 | help |