From: Magnus Damm Date: Mon, 24 Feb 2014 05:52:12 +0000 (+0900) Subject: ARM: shmobile: Move SYSC base variable to inside ifdefs X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c4ca5d80e03559fd95c526ece5ce39fc732a2511;p=linux-beck.git ARM: shmobile: Move SYSC base variable to inside ifdefs Move the rcar_sysc_base variable to inside #ifdefs to avoid triggering build warnings in case PM or SMP is not selected. Signed-off-by: Magnus Damm Signed-off-by: Simon Horman --- diff --git a/arch/arm/mach-shmobile/pm-rcar.c b/arch/arm/mach-shmobile/pm-rcar.c index 17225db09558..1f465a12d1b1 100644 --- a/arch/arm/mach-shmobile/pm-rcar.c +++ b/arch/arm/mach-shmobile/pm-rcar.c @@ -15,8 +15,6 @@ #include #include -static void __iomem *rcar_sysc_base; - /* SYSC */ #define SYSCSR 0x00 #define SYSCISR 0x04 @@ -35,6 +33,7 @@ static void __iomem *rcar_sysc_base; #if defined(CONFIG_PM) || defined(CONFIG_SMP) +static void __iomem *rcar_sysc_base; static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */ static int rcar_sysc_pwr_on_off(struct rcar_sysc_ch *sysc_ch,