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

Hi Vinod,

Today's linux-next merge of the slave-dma tree got conflicts in
drivers/dma/Kconfig and drivers/dma/Makefile between commit 06dba53e6fcf
("dmaengine: add OMAP DMA engine driver") from the arm tree and commit
c6da0ba8dfc8 ("dmaengine: mmp_tdma: add mmp tdma support") from the
slave-dma tree.

Just context changes.  I fixed it up (see below) and can carry the fixes
as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/dma/Kconfig
index 6f93365,d45cf1b..0000000

--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig

@@@ -262,12 -274,16 +276,22 @@@ config DMA_SA11X
  	  SA-1110 SoCs.  This DMA engine can only be used with on-chip
  	  devices.
  
 +config DMA_OMAP
 +	tristate "OMAP DMA support"
 +	depends on ARCH_OMAP
 +	select DMA_ENGINE
 +	select DMA_VIRTUAL_CHANNELS
 +
+ config MMP_TDMA
+ 	bool "MMP Two-Channel DMA support"
+ 	depends on ARCH_MMP
+ 	select DMA_ENGINE
+ 	help
+ 	  Support the MMP Two-Channel DMA engine.
+ 	  This engine used for MMP Audio DMA and pxa910 SQU.
+ 
+ 	  Say Y here if you enabled MMP ADMA, otherwise say N.
+ 
  config DMA_ENGINE
  	bool
  
diff --cc drivers/dma/Makefile
index ddc291a,370a655..0000000

--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile

@@@ -29,4 -29,4 +30,5 @@@ obj-$(CONFIG_PCH_DMA) += pch_dma.
  obj-$(CONFIG_AMBA_PL08X) += amba-pl08x.o
  obj-$(CONFIG_EP93XX_DMA) += ep93xx_dma.o
  obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o
 +obj-$(CONFIG_DMA_OMAP) += omap-dma.o
+ obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o

On Mon, 2012-07-02 at 13:16 +1000, Stephen Rothwell wrote:

Hi Vinod,

Today's linux-next merge of the slave-dma tree got conflicts in
drivers/dma/Kconfig and drivers/dma/Makefile between commit 06dba53e6fcf
("dmaengine: add OMAP DMA engine driver") from the arm tree and commit
c6da0ba8dfc8 ("dmaengine: mmp_tdma: add mmp tdma support") from the
slave-dma tree.

Thanks, Looks like Russell has merged the OMAP changes into his tree?


-- 
~Vinod