Merge branch 'for-2.6.32' into mxc

author Mark Brown <[email protected]>

Sat, 15 Aug 2009 10:20:44 +0000 (11:20 +0100)

committer Mark Brown <[email protected]>

Sat, 15 Aug 2009 10:20:44 +0000 (11:20 +0100)
author Mark Brown <[email protected]>
Sat, 15 Aug 2009 10:20:44 +0000 (11:20 +0100)
committer Mark Brown <[email protected]>
Sat, 15 Aug 2009 10:20:44 +0000 (11:20 +0100)
diff --cc sound/soc/Makefile

index 8120b52a46867e6a5f99ae53ad2ec6bbb7670017,4eaf48aab0faeaabdcb8631b518ac62e443a917c..0c5eac01bf2e5ffbc8d4691987c7097b90dce90a
--- 1/sound/soc/Makefile
--- 2/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/
author	Mark Brown <[email protected]>
	Sat, 15 Aug 2009 10:20:44 +0000 (11:20 +0100)
committer	Mark Brown <[email protected]>
	Sat, 15 Aug 2009 10:20:44 +0000 (11:20 +0100)