From a0deba7a06ae3f46451c0528c5f35ea9d44eabfb Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:38:18 -0400 Subject: [PATCH] --- yaml --- r: 270096 b: refs/heads/master c: e9ce8e5bd0314e90b60e185ca40b1d4740df7f22 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-vexpress/v2m.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a6964f5dccb3..982771e0cf15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 171fa8a7bbaf7eaf7a11f1560f125cff3e3eefc1 +refs/heads/master: e9ce8e5bd0314e90b60e185ca40b1d4740df7f22 diff --git a/trunk/arch/arm/mach-vexpress/v2m.c b/trunk/arch/arm/mach-vexpress/v2m.c index 9e6b93b1a043..de72058180a6 100644 --- a/trunk/arch/arm/mach-vexpress/v2m.c +++ b/trunk/arch/arm/mach-vexpress/v2m.c @@ -436,7 +436,7 @@ static void __init v2m_init(void) } MACHINE_START(VEXPRESS, "ARM-Versatile Express") - .boot_params = PLAT_PHYS_OFFSET + 0x00000100, + .atag_offset = 0x100, .map_io = v2m_map_io, .init_early = v2m_init_early, .init_irq = v2m_init_irq,