aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/pm-rmobile.c
diff options
context:
space:
mode:
authorMagnus Damm <damm+renesas@opensource.se>2014-08-25 12:04:01 +0900
committerSimon Horman <horms+renesas@verge.net.au>2014-09-02 09:32:06 +0900
commitabebbc4a026d8cdceb9f65c497b3db445c8ff5e7 (patch)
treea602cbfc386a582e2eacfecc31bef3f8e60d2aad /arch/arm/mach-shmobile/pm-rmobile.c
parent1a950ca536dd5c40167ef58951e738ae430fa96d (diff)
downloadlinux-linaro-stable-abebbc4a026d8cdceb9f65c497b3db445c8ff5e7.tar.gz
ARM: shmobile: Cleanup pm-rmobile.o build using Kconfig
Add a CONFIG_PM_RMOBILE entry and enable it for R-Mobile SoCs in case CONFIG_PM is set. Consolidate Makefile 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-rmobile.c')
-rw-r--r--arch/arm/mach-shmobile/pm-rmobile.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
index ebdd16e94a84..a88079af7914 100644
--- a/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@ -27,7 +27,6 @@
#define PSTR_RETRIES 100
#define PSTR_DELAY_US 10
-#ifdef CONFIG_PM
static int rmobile_pd_power_down(struct generic_pm_domain *genpd)
{
struct rmobile_pm_domain *rmobile_pd = to_rmobile_pd(genpd);
@@ -151,4 +150,3 @@ void rmobile_add_devices_to_domains(struct pm_domain_device data[],
rmobile_add_device_to_domain_td(data[j].domain_name,
data[j].pdev, &latencies);
}
-#endif /* CONFIG_PM */