From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 15 Aug 2009 10:20:44 +0000 (+0100)
Subject: Merge branch 'for-2.6.32' into mxc
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=08229de4b42816079ed5d15f0689fcd0af946d5e;p=linux.git

Merge branch 'for-2.6.32' into mxc

Conflicts:
	sound/soc/Makefile
---

08229de4b42816079ed5d15f0689fcd0af946d5e
diff --cc sound/soc/Makefile
index 8120b52a46867,4eaf48aab0fae..0c5eac01bf2e5
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@@ -7,6 -7,6 +7,7 @@@ obj-$(CONFIG_SND_SOC)	+= au1x
  obj-$(CONFIG_SND_SOC)	+= blackfin/
  obj-$(CONFIG_SND_SOC)	+= davinci/
  obj-$(CONFIG_SND_SOC)	+= fsl/
++obj-$(CONFIG_SND_SOC)   += imx/
  obj-$(CONFIG_SND_SOC)	+= omap/
  obj-$(CONFIG_SND_SOC)	+= pxa/
  obj-$(CONFIG_SND_SOC)	+= s3c24xx/