linux-next: manual merge of the sound tree with the i.MX tree

[Stephen Rothwell]

Hi Takashi,

Today's linux-next merge of the sound tree got a conflict in
arch/arm/plat-mxc/Makefile between commit
aae7019382896cf1075a93acc564e42601bc44a2 ("imx: only define deprecated
symbols conditionally") from the i.MX tree and commit
8380222ec9458d38a4e0cc3cb688ad7fff311df4 ("ASoC: Add a new imx-ssi sound
driver") from the sound tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/plat-mxc/Makefile
index 7322bca,6cee38d..0000000
--- a/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@@ -14,6 -12,8 +14,10 @@@ obj-$(CONFIG_MXC_PWM)  += pwm.
  obj-$(CONFIG_USB_EHCI_MXC) += ehci.o
  obj-$(CONFIG_MXC_ULPI) += ulpi.o
  obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o
 +CFLAGS_audmux-v1.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
  obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o
 +CFLAGS_audmux-v2.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
+ ifdef CONFIG_SND_IMX_SOC
+ obj-y += ssi-fiq.o
+ obj-y += ssi-fiq-ksym.o
+ endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/