From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Mon, 29 Aug 2011 19:29:00 +0000 (-0400)
Subject: Merge the enabling by default of ARM_PATCH_PHYS_VIRT
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=96f90c791512bf8ceb50572a0e65d4cabb665c60;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge the enabling by default of ARM_PATCH_PHYS_VIRT

Conflicts:
	arch/arm/mach-msm/board-msm7x30.c
---

96f90c791512bf8ceb50572a0e65d4cabb665c60
diff --cc arch/arm/mach-msm/board-msm7x30.c
index 5a2ab6855183,d1e4cc83b1e6..bb72ea0383b7
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@@ -106,7 -122,9 +122,9 @@@ static void __init msm7x30_map_io(void
  }
  
  MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF")
 -	.boot_params = PLAT_PHYS_OFFSET + 0x100,
 +	.atag_offset = 0x100,
+ 	.fixup = msm7x30_fixup,
+ 	.reserve = msm7x30_reserve,
  	.map_io = msm7x30_map_io,
  	.init_irq = msm7x30_init_irq,
  	.init_machine = msm7x30_init,
@@@ -114,7 -132,9 +132,9 @@@
  MACHINE_END
  
  MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA")
 -	.boot_params = PLAT_PHYS_OFFSET + 0x100,
 +	.atag_offset = 0x100,
+ 	.fixup = msm7x30_fixup,
+ 	.reserve = msm7x30_reserve,
  	.map_io = msm7x30_map_io,
  	.init_irq = msm7x30_init_irq,
  	.init_machine = msm7x30_init,
@@@ -122,7 -142,9 +142,9 @@@
  MACHINE_END
  
  MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID")
 -	.boot_params = PLAT_PHYS_OFFSET + 0x100,
 +	.atag_offset = 0x100,
+ 	.fixup = msm7x30_fixup,
+ 	.reserve = msm7x30_reserve,
  	.map_io = msm7x30_map_io,
  	.init_irq = msm7x30_init_irq,
  	.init_machine = msm7x30_init,