From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 17 Jan 2010 16:47:32 +0000 (+0000)
Subject: Merge branch 'mxc-audio' into for-2.6.34
X-Git-Tag: v2.6.35-rc6~9^2~7^2~211
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9135f6db09aa9d186f05d41e9c516ec8e3550d78;p=~emulex%2Finfiniband.git

Merge branch 'mxc-audio' into for-2.6.34

Conflicts:
	arch/arm/plat-mxc/Makefile (dual add)
	sound/soc/imx/mx27vis_wm8974.c (API updates & removal)
---

9135f6db09aa9d186f05d41e9c516ec8e3550d78
diff --cc arch/arm/plat-mxc/Makefile
index 996cbac6932,b0b9fc3e5ab..6cee38df58b
--- a/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@@ -9,7 -9,9 +9,11 @@@ obj-$(CONFIG_ARCH_MX1) += iomux-mx1-mx2
  obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o
  obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
  obj-$(CONFIG_MXC_PWM)  += pwm.o
 +obj-$(CONFIG_USB_EHCI_MXC) += ehci.o
 +obj-$(CONFIG_MXC_ULPI) += ulpi.o
  obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o
  obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o
+ ifdef CONFIG_SND_IMX_SOC
+ obj-y += ssi-fiq.o
+ obj-y += ssi-fiq-ksym.o
+ endif