Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  [ALSA] soc - wm9712 - checkpatch fixes
  [ALSA] pcsp - Fix more dependency
  [ALSA] hda - Add support of Medion RIM 2150
  [ALSA] ASoC: Add drivers for the Texas Instruments OMAP processors
  [ALSA] ice1724 - Enable watermarks
  [ALSA] Add MPU401_INFO_NO_ACK bitflag

1 files changed, 19 insertions, 0 deletions

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
new file mode 100644
index 000000000000..0230d83e8e5e
--- /dev/null
+++ b/sound/soc/omap/Kconfig
@@ -0,0 +1,19 @@
+menu "SoC Audio for the Texas Instruments OMAP"
+
+config SND_OMAP_SOC
+        tristate "SoC Audio for the Texas Instruments OMAP chips"
+        depends on ARCH_OMAP && SND_SOC
+
+config SND_OMAP_SOC_MCBSP
+        tristate
+        select OMAP_MCBSP
+
+config SND_OMAP_SOC_N810
+        tristate "SoC Audio support for Nokia N810"
+        depends on SND_OMAP_SOC && MACH_NOKIA_N810
+        select SND_OMAP_SOC_MCBSP
+        select SND_SOC_TLV320AIC3X
+        help
+          Say Y if you want to add support for SoC audio on Nokia N810.
+
+endmenu