From 14deaef2338657bc4ff1c4791f139430c0f13719 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Wed, 6 Feb 2013 18:25:12 +0000 Subject: [PATCH] --- yaml --- r: 355112 b: refs/heads/master c: ab2a724a2ef9cee5957692257a5d1f08fd7acbbd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-integrator/integrator_ap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f3831f56ef57..7be67cabd450 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1226ff9af84dfa6ef73d95435748569c99b5171 +refs/heads/master: ab2a724a2ef9cee5957692257a5d1f08fd7acbbd diff --git a/trunk/arch/arm/mach-integrator/integrator_ap.c b/trunk/arch/arm/mach-integrator/integrator_ap.c index 11e2a4145807..26762bf41308 100644 --- a/trunk/arch/arm/mach-integrator/integrator_ap.c +++ b/trunk/arch/arm/mach-integrator/integrator_ap.c @@ -613,7 +613,6 @@ static struct map_desc ap_io_desc_atag[] __initdata = { static void __init ap_map_io_atag(void) { iotable_init(ap_io_desc_atag, ARRAY_SIZE(ap_io_desc_atag)); - ap_syscon_base = __io_address(INTEGRATOR_SC_BASE); ap_map_io(); } @@ -685,6 +684,7 @@ static void __init ap_init(void) platform_device_register(&cfi_flash_device); + ap_syscon_base = __io_address(INTEGRATOR_SC_BASE); sc_dec = readl(ap_syscon_base + INTEGRATOR_SC_DEC_OFFSET); for (i = 0; i < 4; i++) { struct lm_device *lmdev;