From 8626de6f5550e9063d466eeb9766df276496e1eb Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:38:14 -0400 Subject: [PATCH] --- yaml --- r: 270075 b: refs/heads/master c: 013b5fb2830466c48c8ac9a7673c525d33d922c8 h: refs/heads/master i: 270073: 309c55133f3fced477f2bc49e4fd8675ee7180f5 270071: c41b9c81dc2f743bb98f5fe7ff9dcfff774d7edb v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-nomadik/board-nhk8815.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cb7d584554fc..5ca981c7c9fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b11fd42cad65c65609bd90936307e204d1f2a11a +refs/heads/master: 013b5fb2830466c48c8ac9a7673c525d33d922c8 diff --git a/trunk/arch/arm/mach-nomadik/board-nhk8815.c b/trunk/arch/arm/mach-nomadik/board-nhk8815.c index 139930350d93..398a75f62bee 100644 --- a/trunk/arch/arm/mach-nomadik/board-nhk8815.c +++ b/trunk/arch/arm/mach-nomadik/board-nhk8815.c @@ -276,7 +276,7 @@ static void __init nhk8815_platform_init(void) MACHINE_START(NOMADIK, "NHK8815") /* Maintainer: ST MicroElectronics */ - .boot_params = 0x100, + .atag_offset = 0x100, .map_io = cpu8815_map_io, .init_irq = cpu8815_init_irq, .timer = &nomadik_timer,