Merge the enabling by default of ARM_PATCH_PHYS_VIRT
authorNicolas Pitre <nicolas.pitre@linaro.org>
Mon, 29 Aug 2011 19:29:00 +0000 (15:29 -0400)
committerNicolas Pitre <nico@fluxnic.net>
Mon, 29 Aug 2011 19:29:00 +0000 (15:29 -0400)
Conflicts:
arch/arm/mach-msm/board-msm7x30.c

1  2 
arch/arm/include/asm/memory.h
arch/arm/mach-msm/board-msm7x30.c

Simple merge
@@@ -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,
  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,
  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,