linux-next: manual merge of the msm tree with Linus' tree

[Stephen Rothwell]

Hi David,

Today's linux-next merge of the msm tree got a conflict in
arch/arm/mach-msm/io.c between commit 03db0729b760 ("msm: Remove
chip-ifdefs for GPIO io mappings") from Linus' tree and commit
5f0130d53e0e ("msm: dma: use a platform device for msm_dmov") from the
msm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-msm/io.c
index 140ddbb,1c86cda..0000000
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@@ -42,9 -42,8 +42,8 @@@
  static struct map_desc msm_io_desc[] __initdata = {
  	MSM_DEVICE(VIC),
  	MSM_CHIP_DEVICE(CSR, MSM7X00),
- 	MSM_DEVICE(DMOV),
 -	MSM_DEVICE(GPIO1),
 -	MSM_DEVICE(GPIO2),
 +	MSM_CHIP_DEVICE(GPIO1, MSM7X00),
 +	MSM_CHIP_DEVICE(GPIO2, MSM7X00),
  	MSM_DEVICE(CLK_CTL),
  #ifdef CONFIG_MSM_DEBUG_UART
  	MSM_DEVICE(DEBUG_UART),
@@@ -75,9 -74,8 +74,8 @@@ void __init msm_map_common_io(void
  static struct map_desc qsd8x50_io_desc[] __initdata = {
  	MSM_DEVICE(VIC),
  	MSM_CHIP_DEVICE(CSR, QSD8X50),
- 	MSM_DEVICE(DMOV),
 -	MSM_DEVICE(GPIO1),
 -	MSM_DEVICE(GPIO2),
 +	MSM_CHIP_DEVICE(GPIO1, QSD8X50),
 +	MSM_CHIP_DEVICE(GPIO2, QSD8X50),
  	MSM_DEVICE(CLK_CTL),
  	MSM_DEVICE(SIRC),
  	MSM_DEVICE(SCPLL),
@@@ -134,9 -132,8 +132,8 @@@ void __init msm_map_msm8960_io(void
  static struct map_desc msm7x30_io_desc[] __initdata = {
  	MSM_DEVICE(VIC),
  	MSM_CHIP_DEVICE(CSR, MSM7X30),
- 	MSM_DEVICE(DMOV),
 -	MSM_DEVICE(GPIO1),
 -	MSM_DEVICE(GPIO2),
 +	MSM_CHIP_DEVICE(GPIO1, MSM7X30),
 +	MSM_CHIP_DEVICE(GPIO2, MSM7X30),
  	MSM_DEVICE(CLK_CTL),
  	MSM_DEVICE(CLK_CTL_SH2),
  	MSM_DEVICE(AD5),
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/