diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-17 10:34:54 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-17 10:34:54 -0400 |
commit | 3e9248c055609b11a6d62d1129fbf27ce0990ff4 (patch) | |
tree | e9421cdfba10f6af003305cf0f639aa462f751ce /arch/arm/mach-versatile/versatile_pb.c | |
parent | 14eff7b679a0ea42049cd806545466769f8d1d2d (diff) | |
parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) |
Merge remote-tracking branch 'rmk/devel-stable' into linaro-3.1
Diffstat (limited to 'arch/arm/mach-versatile/versatile_pb.c')
-rw-r--r-- | arch/arm/mach-versatile/versatile_pb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c index 37c23dfeefb..feaf9cbe60f 100644 --- a/arch/arm/mach-versatile/versatile_pb.c +++ b/arch/arm/mach-versatile/versatile_pb.c @@ -103,7 +103,7 @@ static void __init versatile_pb_init(void) MACHINE_START(VERSATILE_PB, "ARM-Versatile PB") /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ - .boot_params = 0x00000100, + .atag_offset = 0x100, .map_io = versatile_map_io, .init_early = versatile_init_early, .init_irq = versatile_init_irq, |