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: (252 commits)
  ASoC: Check progress when reporting periods from i.MX FIQ handler
  ASoC: Remove a unused variables from i.MX FIQ runtime data
  ALSA: hda - Add/fix ALC269 FSC and Quanta models
  ALSA: hda - Add ALC670 codec support
  OMAP4: PMIC: Add support for twl6030 codec
  ALSA: hda - remove unnecessary msleep on power state transitions
  usb/gadget/{f_audio,gmidi}.c: follow recent changes in audio.h
  ASoC: fsi: Modify over/under run error settlement
  ASoC: OMAP4: Add McPDM platform driver
  ASoC: OMAP4: Add support for McPDM
  ASoC: OMAP: data_type and sync_mode configurable in audio dma
  ALSA: hda - Add missing description in HD-Audio-Models.txt
  ALSA: add support for Macbook Air 2,1 internal speaker
  ALSA: usbaudio: consolidate header files
  ALSA: usbmixer: bail out early when parsing audio class v2 descriptors
  ALSA: usbaudio: implement basic set of class v2.0 parser
  ALSA: usbaudio: introduce new types for audio class v2
  ALSA: usbaudio: parse USB descriptors with structs
  ALSA: hda - enable snoop for Intel Cougar Point
  ALSA: hda - Remove identical definitions for macmini3 model
  ...

1 files changed, 16 insertions, 6 deletions

diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
index b489f1ae103d..15fe57e5a232 100644
--- a/sound/soc/s3c24xx/Kconfig
+++ b/sound/soc/s3c24xx/Kconfig
@@ -27,12 +27,10 @@ config SND_S3C64XX_SOC_I2S
 config SND_S3C_SOC_PCM
         tristate
 
-config SND_S3C2443_SOC_AC97
+config SND_S3C_SOC_AC97
         tristate
-        select S3C2410_DMA
-        select AC97_BUS
         select SND_SOC_AC97_BUS
-        
+
 config SND_S3C24XX_SOC_NEO1973_WM8753
         tristate "SoC I2S Audio support for NEO1973 - WM8753"
         depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA01
@@ -71,8 +69,10 @@ config SND_S3C64XX_SOC_WM8580
 config SND_S3C24XX_SOC_SMDK2443_WM9710
         tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
         depends on SND_S3C24XX_SOC && MACH_SMDK2443
-        select SND_S3C2443_SOC_AC97
+        select S3C2410_DMA
+        select AC97_BUS
         select SND_SOC_AC97_CODEC
+        select SND_S3C_SOC_AC97
         help
           Say Y if you want to add support for SoC audio on smdk2443
           with the WM9710.
@@ -80,8 +80,10 @@ config SND_S3C24XX_SOC_SMDK2443_WM9710
 config SND_S3C24XX_SOC_LN2440SBC_ALC650
         tristate "SoC AC97 Audio support for LN2440SBC - ALC650"
         depends on SND_S3C24XX_SOC && ARCH_S3C2410
-        select SND_S3C2443_SOC_AC97
+        select S3C2410_DMA
+        select AC97_BUS
         select SND_SOC_AC97_CODEC
+        select SND_S3C_SOC_AC97
         help
           Say Y if you want to add support for SoC audio on ln2440sbc
           with the ALC650.
@@ -111,3 +113,11 @@ config SND_S3C24XX_SOC_SIMTEC_HERMES
         select SND_S3C24XX_SOC_I2S
         select SND_SOC_TLV320AIC3X
         select SND_S3C24XX_SOC_SIMTEC
+
+config SND_SOC_SMDK_WM9713
+        tristate "SoC AC97 Audio support for SMDK with WM9713"
+        depends on SND_S3C24XX_SOC && MACH_SMDK6410
+        select SND_SOC_WM9713
+        select SND_S3C_SOC_AC97
+        help
+          Sat Y if you want to add support for SoC audio on the SMDK.