aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-12 18:42:49 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-12 18:42:49 -0500
commitbf7c5449e6240c510df5fafcffd8b7bfd9f8e831 (patch)
tree72b70be8824430600604198ced2209b94f64d9fd /arch/arm/mach-omap1
parent641d334b29429f1d191b4bb4295f7a259b1660cc (diff)
ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks depending on CONFIG_PM_RUNTIME may now be changed to depend on CONFIG_PM. Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere in the code under arch/arm/ (the defconfig files will be modified later). Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Nishanth Menon <nm@ti.com> Acked-by: Sekhar Nori <nsekhar@ti.com> Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r--arch/arm/mach-omap1/pm_bus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
index 3f2d39672393..c40e209de65c 100644
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/arch/arm/mach-omap1/pm_bus.c
@@ -21,7 +21,7 @@
21 21
22#include "soc.h" 22#include "soc.h"
23 23
24#ifdef CONFIG_PM_RUNTIME 24#ifdef CONFIG_PM
25static int omap1_pm_runtime_suspend(struct device *dev) 25static int omap1_pm_runtime_suspend(struct device *dev)
26{ 26{
27 int ret; 27 int ret;
@@ -59,7 +59,7 @@ static struct dev_pm_domain default_pm_domain = {
59#define OMAP1_PM_DOMAIN (&default_pm_domain) 59#define OMAP1_PM_DOMAIN (&default_pm_domain)
60#else 60#else
61#define OMAP1_PM_DOMAIN NULL 61#define OMAP1_PM_DOMAIN NULL
62#endif /* CONFIG_PM_RUNTIME */ 62#endif /* CONFIG_PM */
63 63
64static struct pm_clk_notifier_block platform_bus_notifier = { 64static struct pm_clk_notifier_block platform_bus_notifier = {
65 .pm_domain = OMAP1_PM_DOMAIN, 65 .pm_domain = OMAP1_PM_DOMAIN,