summaryrefslogtreecommitdiffstats
path: root/sound/soc/mxs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-05 14:05:11 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-05 14:05:11 +0200
commit75d8f2931a803b803cb4a850448460475c20f30b (patch)
tree9853b9084fa55609c8e4abbc1763bc500e05da50 /sound/soc/mxs
parentASoC: Davinci: evm: Fix typo in cpu dai name (diff)
parentASoC: omap-mcbsp: Fix compilation error due to leftover code (diff)
downloadlinux-75d8f2931a803b803cb4a850448460475c20f30b.tar.xz
linux-75d8f2931a803b803cb4a850448460475c20f30b.zip
Merge branch 'asoc-omap' into for-3.7
Diffstat (limited to 'sound/soc/mxs')
-rw-r--r--sound/soc/mxs/Kconfig2
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
if SND_MXS_SOC
config SND_SOC_MXS_SGTL5000
- tristate "SoC Audio support for i.MX boards with sgtl5000"
+ tristate "SoC Audio support for MXS boards with sgtl5000"
depends on I2C
select SND_SOC_SGTL5000
help