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: (308 commits)
  ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl
  ALSA: aloop - Fix possible IRQ lock inversion
  ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail()
  ALSA: ctxfi - use list_move() instead of list_del()/list_add() combination
  ALSA: firewire - msleep needs delay.h
  ALSA: firewire-lib, firewire-speakers: handle packet queueing errors
  ALSA: firewire-lib: allocate DMA buffer separately
  ALSA: firewire-lib: use no-info SYT for packets without SYT sample
  ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver
  ALSA: hda - Remove an unused variable in patch_realtek.c
  ALSA: hda - pin-adc-mux-dmic auto-configuration of 92HD8X codecs
  ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs
  ALSA: hda - Move default input-src selection to init part
  ALSA: hda - Initialize special cases for input src in init phase
  ALSA: ctxfi - Clear input settings before initialization
  ALSA: ctxfi - Fix SPDIF status retrieval
  ALSA: ctxfi - Fix incorrect SPDIF status bit mask
  ALSA: ctxfi - Fix microphone boost codes/comments
  ALSA: atiixp - Fix wrong time-out checks during ac-link reset
  ALSA: intel8x0m: append 'm' to "r_intel8x0"
  ...

diff --combined arch/sh/boards/mach-ecovec24/setup.c
index 3b71d2190de1b1782af836c668cb5f85da669d6f,7bdb572ddf9382247986a801b72addb650883e81..e44480ce2ea8c32555c84e4f7caf3e033f65a850
--- 1/arch/sh/boards/mach-ecovec24/setup.c
--- 2/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@@ -142,8 -142,6 +142,8 @@@ static struct resource sh_eth_resources
  static struct sh_eth_plat_data sh_eth_plat = {
        .phy = 0x1f, /* SMSC LAN8700 */
        .edmac_endian = EDMAC_LITTLE_ENDIAN,
 +      .register_type = SH_ETH_REG_FAST_SH4,
 +      .phy_interface = PHY_INTERFACE_MODE_MII,
        .ether_link_active_low = 1
  };
  
@@@ -725,11 -723,7 +725,7 @@@ static struct platform_device camera_de
  
  /* FSI */
  static struct sh_fsi_platform_info fsi_info = {
-       .portb_flags = SH_FSI_BRS_INV |
-                      SH_FSI_OUT_SLAVE_MODE |
-                      SH_FSI_IN_SLAVE_MODE |
-                      SH_FSI_OFMT(I2S) |
-                      SH_FSI_IFMT(I2S),
+       .portb_flags = SH_FSI_BRS_INV,
  };
  
  static struct resource fsi_resources[] = {

diff --combined sound/soc/samsung/Kconfig
index d6713d5a90e757bac2121c66289b4d43fe34bc62,a08237acc53b73dc399832ded9fd32ae695bd4de..a3fdfb63146938780e5bd7dfbfb46e5e256e4a36
--- 1/sound/soc/samsung/Kconfig
--- 2/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
  config SND_SOC_SAMSUNG
        tristate "ASoC support for Samsung"
 -      depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_S5PV310
 +      depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_EXYNOS4
        select S3C64XX_DMA if ARCH_S3C64XX
        select S3C2410_DMA if ARCH_S3C2410
        help
@@@ -35,23 -35,16 +35,16 @@@ config SND_SAMSUNG_I2
        tristate
  
  config SND_SOC_SAMSUNG_NEO1973_WM8753
-       tristate "SoC I2S Audio support for NEO1973 - WM8753"
-       depends on SND_SOC_SAMSUNG && MACH_NEO1973_GTA01
+       tristate "Audio support for Openmoko Neo1973 Smartphones (GTA01/GTA02)"
+       depends on SND_SOC_SAMSUNG && (MACH_NEO1973_GTA01 || MACH_NEO1973_GTA02)
        select SND_S3C24XX_I2S
        select SND_SOC_WM8753
+       select SND_SOC_LM4857 if MACH_NEO1973_GTA01
+       select SND_SOC_DFBMCS320
        help
-         Say Y if you want to add support for SoC audio on smdk2440
-         with the WM8753.
+         Say Y here to enable audio support for the Openmoko Neo1973
+         Smartphones.
  
- config SND_SOC_SAMSUNG_NEO1973_GTA02_WM8753
-       tristate "Audio support for the Openmoko Neo FreeRunner (GTA02)"
-       depends on SND_SOC_SAMSUNG && MACH_NEO1973_GTA02
-       select SND_S3C24XX_I2S
-       select SND_SOC_WM8753
-       help
-         This driver provides audio support for the Openmoko Neo FreeRunner
-         smartphone.
-         
  config SND_SOC_SAMSUNG_JIVE_WM8750
        tristate "SoC I2S Audio support for Jive"
        depends on SND_SOC_SAMSUNG && MACH_JIVE