From 86bf750f0a8b64e5ea8133a25df767fb9a661eda Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:38:11 -0400 Subject: [PATCH] --- yaml --- r: 270051 b: refs/heads/master c: 03e672022b92de35a60bec1437ccbdb73986ac9c h: refs/heads/master i: 270049: dfc146122f97d520a6bad28be7ccb96f6a19aa2d 270047: 66dc7579cb7be8dfd47e860e3df7a11f521844e8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-cns3xxx/cns3420vb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2a34871f2ae2..048718771f96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6244fa9cbd078f598f8f4dcb2017d37b45ac3cee +refs/heads/master: 03e672022b92de35a60bec1437ccbdb73986ac9c diff --git a/trunk/arch/arm/mach-cns3xxx/cns3420vb.c b/trunk/arch/arm/mach-cns3xxx/cns3420vb.c index 3e7d1496cb47..55f7b4b08ab9 100644 --- a/trunk/arch/arm/mach-cns3xxx/cns3420vb.c +++ b/trunk/arch/arm/mach-cns3xxx/cns3420vb.c @@ -197,7 +197,7 @@ static void __init cns3420_map_io(void) } MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board") - .boot_params = 0x00000100, + .atag_offset = 0x100, .map_io = cns3420_map_io, .init_irq = cns3xxx_init_irq, .timer = &cns3xxx_timer,