From 3aa64172d7179ccc8a584635fb942a91f8ae9921 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:38:18 -0400 Subject: [PATCH] --- yaml --- r: 270095 b: refs/heads/master c: 171fa8a7bbaf7eaf7a11f1560f125cff3e3eefc1 h: refs/heads/master i: 270093: 25e11ceccd6f3b11ab4733ffa5a512f61182d1cf 270091: 46b6f661d456984fc0a61019414406c1a5de64f4 270087: 4c6ffa2ee597d434538f76ccc6a592a1545f5c27 270079: 70f0da57566d8381ecb91ed74bfd05935eb00cfe v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-versatile/versatile_ab.c | 2 +- trunk/arch/arm/mach-versatile/versatile_pb.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ca7992c90c7c..a6964f5dccb3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc77b1aa0c1584d52ed1883825bc6e04ab1a6277 +refs/heads/master: 171fa8a7bbaf7eaf7a11f1560f125cff3e3eefc1 diff --git a/trunk/arch/arm/mach-versatile/versatile_ab.c b/trunk/arch/arm/mach-versatile/versatile_ab.c index f8ae64b3eed0..fda4866703cd 100644 --- a/trunk/arch/arm/mach-versatile/versatile_ab.c +++ b/trunk/arch/arm/mach-versatile/versatile_ab.c @@ -35,7 +35,7 @@ MACHINE_START(VERSATILE_AB, "ARM-Versatile AB") /* 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, diff --git a/trunk/arch/arm/mach-versatile/versatile_pb.c b/trunk/arch/arm/mach-versatile/versatile_pb.c index 37c23dfeefb7..feaf9cbe60f6 100644 --- a/trunk/arch/arm/mach-versatile/versatile_pb.c +++ b/trunk/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,