diff options
| author | Magnus Damm <damm+renesas@opensource.se> | 2014-08-25 12:03:52 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-09-02 09:32:05 +0900 |
| commit | 1a950ca536dd5c40167ef58951e738ae430fa96d (patch) | |
| tree | bd24b81db58bf51baa4c4e64d3915664dea4cfb0 /arch/arm/mach-shmobile/pm-rcar.c | |
| parent | 0d91843346049d3131c2f75ff21d6b405cb68741 (diff) | |
| download | lwn-1a950ca536dd5c40167ef58951e738ae430fa96d.tar.gz lwn-1a950ca536dd5c40167ef58951e738ae430fa96d.zip | |
ARM: shmobile: Cleanup pm-rcar.o build using Kconfig
Add a CONFIG_PM_RCAR entry and enable it for R-Car
Generation 1 or 2 in case CONFIG_PM or CONFIG_SMP
is set. Consolidate power management objects and
get rid of #ifdefs in the C code.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/pm-rcar.c')
| -rw-r--r-- | arch/arm/mach-shmobile/pm-rcar.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/pm-rcar.c b/arch/arm/mach-shmobile/pm-rcar.c index 34b8a5674f85..00022ee56f80 100644 --- a/arch/arm/mach-shmobile/pm-rcar.c +++ b/arch/arm/mach-shmobile/pm-rcar.c @@ -31,8 +31,6 @@ #define SYSCISR_RETRIES 1000 #define SYSCISR_DELAY_US 1 -#if defined(CONFIG_PM) || defined(CONFIG_SMP) - static void __iomem *rcar_sysc_base; static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */ @@ -137,5 +135,3 @@ void __iomem *rcar_sysc_init(phys_addr_t base) return rcar_sysc_base; } - -#endif /* CONFIG_PM || CONFIG_SMP */ |