Merge branch 'master' into for-next

Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.

1 files changed, 20 insertions, 0 deletions

diff --git a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig
new file mode 100644
index 00000000000..e4ba8d5f25f
--- /dev/null
+++ b/sound/soc/mxs/Kconfig
@@ -0,0 +1,20 @@
+menuconfig SND_MXS_SOC
+        tristate "SoC Audio for Freescale MXS CPUs"
+        depends on ARCH_MXS
+        select SND_PCM
+        help
+          Say Y or M if you want to add support for codecs attached to
+          the MXS SAIF interface.
+
+
+if SND_MXS_SOC
+
+config SND_SOC_MXS_SGTL5000
+        tristate "SoC Audio support for i.MX boards with sgtl5000"
+        depends on I2C
+        select SND_SOC_SGTL5000
+        help
+          Say Y if you want to add support for SoC audio on an MXS board with
+          a sgtl5000 codec.
+
+endif   # SND_MXS_SOC