diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
| commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
| tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/mach-vexpress/v2m.c | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-vexpress/v2m.c')
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index d0d267a8d3f9..1fafc3244607 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c | |||
| @@ -443,7 +443,7 @@ static void __init v2m_init(void) | |||
| 443 | } | 443 | } |
| 444 | 444 | ||
| 445 | MACHINE_START(VEXPRESS, "ARM-Versatile Express") | 445 | MACHINE_START(VEXPRESS, "ARM-Versatile Express") |
| 446 | .boot_params = PLAT_PHYS_OFFSET + 0x00000100, | 446 | .atag_offset = 0x100, |
| 447 | .map_io = v2m_map_io, | 447 | .map_io = v2m_map_io, |
| 448 | .init_early = v2m_init_early, | 448 | .init_early = v2m_init_early, |
| 449 | .init_irq = v2m_init_irq, | 449 | .init_irq = v2m_init_irq, |