[PATCH] ARM: shmobile: Move SYSC base variable to inside ifdefs

Magnus Damm magnus.damm at gmail.com
Mon Feb 24 00:52:12 EST 2014


From: Magnus Damm <damm at opensource.se>

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 <damm at opensource.se>
---

 Depends on "[PATCH 00/12] ARM: shmobile: Rework include path for SoC files"

 arch/arm/mach-shmobile/pm-rcar.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- 0013/arch/arm/mach-shmobile/pm-rcar.c
+++ work/arch/arm/mach-shmobile/pm-rcar.c	2014-02-24 14:09:44.000000000 +0900
@@ -15,8 +15,6 @@
 #include <asm/io.h>
 #include "pm-rcar.h"
 
-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,



More information about the linux-arm-kernel mailing list