Messages in this thread | | | Date | Mon, 24 Sep 2012 19:28:44 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the slave-dma tree |
| |
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@canb.auug.org.au
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" [unhandled content-type:application/pgp-signature] | |