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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 23 Mar 2015 12:03:14 +1100

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
drivers/bus/Makefile between commit 6320c41198c7 ("drivers: bus: Sort
Makefile entries alphabetically") from the arm-soc tree and commit
cd46cf20d04a ("MIPS: Add CDMM bus support") from the mips tree.

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

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/bus/Makefile
index e023a2bec664,807dd17ef2f8..000000000000
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@@ -2,13 -2,11 +2,14 @@@
  # Makefile for the bus drivers.
  #
  
 +# Interconnect bus drivers for ARM platforms
 +obj-$(CONFIG_ARM_CCI)		+= arm-cci.o
 +obj-$(CONFIG_ARM_CCN)		+= arm-ccn.o
 +
  obj-$(CONFIG_BRCMSTB_GISB_ARB)	+= brcmstb_gisb.o
 -obj-$(CONFIG_IMX_WEIM)	+= imx-weim.o
 +obj-$(CONFIG_IMX_WEIM)		+= imx-weim.o
+ obj-$(CONFIG_MIPS_CDMM) += mips_cdmm.o
 -obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o
 -obj-$(CONFIG_OMAP_OCP2SCP)	+= omap-ocp2scp.o
 +obj-$(CONFIG_MVEBU_MBUS) 	+= mvebu-mbus.o
  
  # Interconnect bus driver for OMAP SoCs.
  obj-$(CONFIG_OMAP_INTERCONNECT)	+= omap_l3_smx.o omap_l3_noc.o