From f3d143aae9792a6e0ca533a48335fa79896444c9 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:38:18 -0400 Subject: [PATCH] --- yaml --- r: 270099 b: refs/heads/master c: 0cc9311fad9eab567cea0b94e37ef73aef7a8cee h: refs/heads/master i: 270097: dea81ce2ba0153d86dc2dff0c241909774f57f06 270095: 3aa64172d7179ccc8a584635fb942a91f8ae9921 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-prima2/prima2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cd56c26978f7..45924cb32df6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b84047e514b62456e2322f053859243459144593 +refs/heads/master: 0cc9311fad9eab567cea0b94e37ef73aef7a8cee diff --git a/trunk/arch/arm/mach-prima2/prima2.c b/trunk/arch/arm/mach-prima2/prima2.c index f57124bdd143..5654a04319fd 100644 --- a/trunk/arch/arm/mach-prima2/prima2.c +++ b/trunk/arch/arm/mach-prima2/prima2.c @@ -31,7 +31,7 @@ static const char *prima2cb_dt_match[] __initdata = { MACHINE_START(PRIMA2_EVB, "prima2cb") /* Maintainer: Barry Song */ - .boot_params = 0x00000100, + .atag_offset = 0x100, .init_early = sirfsoc_of_clk_init, .map_io = sirfsoc_map_lluart, .init_irq = sirfsoc_of_irq_init,