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: (346 commits)
  ASoC: core: Don't set "(null)" as a driver name
  ALSA: hda - Use LPIB for ATI/AMD chipsets as default
  Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"
  ASoC: Tegra: Fix compile when debugfs not enabled
  ASoC: spdif-dit: Add missing MODULE_*
  SOUND: OSS: Remove Au1550 driver.
  ALSA: hda - add Intel Panther Point HDMI codec id
  ALSA: emu10k1 - Add dB range to Bass and Treble for SB Live!
  ALSA: hda - Remove PCM mixer elements from Virtual Master of realtek
  ALSA: hda - Fix input-src parse in patch_analog.c
  ASoC: davinci-mcasp: enable ping-pong SRAM buffers
  ASoC: add iPAQ hx4700 machine driver
  ASoC: Asahi Kasei AK4641 codec driver
  ALSA: hda - Enable Realtek ALC269 codec input layer beep
  ALSA: intel8x0m: enable AMD8111 modem
  ALSA: HDA: Add jack detection for HDMI
  ALSA: sound, core, pcm_lib: fix xrun_log
  ASoC: Max98095: Move existing NULL check before pointer dereference.
  ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt
  ALSA: usb-audio - Add support for USB X-Fi S51 Pro
  ...

1 files changed, 26 insertions, 12 deletions

diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 66b504f06c23..035d39a4beb4 100644
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -1,26 +1,40 @@
-config SND_TEGRA_SOC
+config SND_SOC_TEGRA
         tristate "SoC Audio for the Tegra System-on-Chip"
         depends on ARCH_TEGRA && TEGRA_SYSTEM_DMA
-        default m
         help
           Say Y or M here if you want support for SoC audio on Tegra.
 
-config SND_TEGRA_SOC_I2S
+config SND_SOC_TEGRA_I2S
         tristate
-        depends on SND_TEGRA_SOC
-        default m
+        depends on SND_SOC_TEGRA
         help
           Say Y or M if you want to add support for codecs attached to the
           Tegra I2S interface. You will also need to select the individual
           machine drivers to support below.
 
-config SND_TEGRA_SOC_HARMONY
-        tristate "SoC Audio support for Tegra Harmony reference board"
-        depends on SND_TEGRA_SOC && MACH_HARMONY && I2C
-        default m
-        select SND_TEGRA_SOC_I2S
+config MACH_HAS_SND_SOC_TEGRA_WM8903
+        bool
+        help
+          Machines that use the SND_SOC_TEGRA_WM8903 driver should select
+          this config option, in order to allow the user to enable
+          SND_SOC_TEGRA_WM8903.
+
+config SND_SOC_TEGRA_WM8903
+        tristate "SoC Audio support for Tegra boards using a WM8903 codec"
+        depends on SND_SOC_TEGRA && I2C
+        depends on MACH_HAS_SND_SOC_TEGRA_WM8903
+        select SND_SOC_TEGRA_I2S
         select SND_SOC_WM8903
         help
-          Say Y or M here if you want to add support for SoC audio on the
-          Tegra Harmony reference board.
+          Say Y or M here if you want to add support for SoC audio on Tegra
+          boards using the WM8093 codec. Currently, the supported boards are
+          Harmony, Ventana, Seaboard, Kaen, and Aebl.
 
+config SND_SOC_TEGRA_TRIMSLICE
+        tristate "SoC Audio support for TrimSlice board"
+        depends on SND_SOC_TEGRA && MACH_TRIMSLICE && I2C
+        select SND_SOC_TEGRA_I2S
+        select SND_SOC_TLV320AIC23
+        help
+          Say Y or M here if you want to add support for SoC audio on the
+          TrimSlice platform.