Merge branches 'fixes', 'pgt-next' and 'versatile' into devel

[sfrench/cifs-2.6.git] / arch / arm / mach-vexpress / ct-ca9x4.c

diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index ff48ebc1a40be9dc9eb5d90f7e76e38e47afb207..30d5a5b0ac2172b9cd123ff89ef669cfbb6b281c 100644 (file)
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -208,7 +208,7 @@ static void __init ct_ca9x4_init(void)
 }
 
 MACHINE_START(VEXPRESS, "ARM-Versatile Express CA9x4")
-       .boot_params    = PHYS_OFFSET + 0x00000100,
+       .boot_params    = PLAT_PHYS_OFFSET + 0x00000100,
        .map_io         = ct_ca9x4_map_io,
        .init_irq       = ct_ca9x4_init_irq,
        .init_early     = ct_ca9x4_init_early,