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

From: Stephen Rothwell
Date: Fri Jun 21 2013 - 02:45:24 EST

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
include/linux/mfd/davinci_voicecodec.h between commit 997174705458 ("mfd:
davinci_voicecodec: Fix build breakage") from the mfd tree and commit
3ad7a42d5a9c ("ARM: davinci: move private EDMA API to arm/common") from
the arm-soc tree.

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

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc include/linux/mfd/davinci_voicecodec.h
index 810aee7,7dd6524..0000000
--- a/include/linux/mfd/davinci_voicecodec.h
+++ b/include/linux/mfd/davinci_voicecodec.h
@@@ -26,10 -26,8 +26,10 @@@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/mfd/core.h>
+ #include <linux/platform_data/edma.h>

- #include <mach/edma.h>
+#include <mach/hardware.h>
* Register values.

Attachment: pgp00000.pgp
Description: PGP signature