From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 02:00:33 +0000 (+1100)
Subject: Merge remote-tracking branch 'arm-soc/for-next'
X-Git-Tag: next-20111103~78
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=38f4446aa5f9296cd34d5a1bae9e52a8002147d2;p=karo-tx-linux.git

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
	arch/arm/mach-omap2/Makefile
	arch/arm/plat-omap/devices.c
---

38f4446aa5f9296cd34d5a1bae9e52a8002147d2
diff --cc arch/arm/mach-msm/board-msm8x60.c
index cf38e2284fa9,cf38e2284fa9..f4824ad4d0bf
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@@ -142,6 -142,6 +142,8 @@@ MACHINE_EN
  #ifdef CONFIG_OF
  /* TODO: General device tree support for all MSM. */
  DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
++	.fixup = msm8x60_fixup,
++	.reserve = msm8x60_reserve,
  	.map_io = msm8x60_map_io,
  	.init_irq = msm8x60_init_irq,
  	.init_machine = msm8x60_dt_init,