* [PATCH] ARM: shmobile: Move SYSC base variable to inside ifdefs
@ 2014-02-24 5:52 Magnus Damm
2014-02-26 5:54 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Magnus Damm @ 2014-02-24 5:52 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@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@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,
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] ARM: shmobile: Move SYSC base variable to inside ifdefs
2014-02-24 5:52 [PATCH] ARM: shmobile: Move SYSC base variable to inside ifdefs Magnus Damm
@ 2014-02-26 5:54 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2014-02-26 5:54 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 24, 2014 at 02:52:12PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@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@opensource.se>
Thanks, I have queued this up.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-02-26 5:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-24 5:52 [PATCH] ARM: shmobile: Move SYSC base variable to inside ifdefs Magnus Damm
2014-02-26 5:54 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox