linux-next: manual merge of the slave-dma tree with Linus' tree

[Stephen Rothwell]

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
arch/arm/mach-imx/Kconfig between commit 3c77c29c49c6 ("ASoC: imx: move
audmux driver into sound/soc/imx") from Linus' tree and commit
6bd081277ea0 ("dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c")
from the slave-dma tree.

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

diff --cc arch/arm/mach-imx/Kconfig
index 3919fba,3da1421..0000000
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@@ -46,7 -30,7 +42,6 @@@ config SOC_IMX2
  	bool
  	select MACH_MX21
  	select CPU_ARM926T
- 	select IMX_HAVE_DMA_V1
 -	select ARCH_MXC_AUDMUX_V1
  	select IMX_HAVE_IOMUX_V1
  	select MXC_AVIC
  
@@@ -61,7 -46,7 +56,6 @@@ config SOC_IMX2
  	bool
  	select MACH_MX27
  	select CPU_ARM926T
- 	select IMX_HAVE_DMA_V1
 -	select ARCH_MXC_AUDMUX_V1
  	select IMX_HAVE_IOMUX_V1
  	select MXC_AVIC

Attachment: pgp00000.pgp
Description: PGP signature