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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/dma/mmp_tdma.c between commit f1a7757008b8 ("dmaengine: mmp_tdma:
add dt support") from the slave-dma tree and commit 293b2da1b611 ("ARM:
pxa: move platform_data definitions") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/dma/mmp_tdma.c
index b93d73c,07fa486..0000000
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@@ -19,8 -19,7 +19,8 @@@
  #include <linux/platform_device.h>
  #include <linux/device.h>
  #include <mach/regs-icu.h>
- #include <mach/sram.h>
 +#include <linux/of_device.h>
+ #include <linux/platform_data/dma-mmp_tdma.h>
  
  #include "dmaengine.h"

Attachment: pgp00000.pgp
Description: PGP signature