[PATCH] drivers: sh / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

From: Rafael J. Wysocki
Date: Wed Dec 03 2014 - 20:03:03 EST

From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

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

Replace CONFIG_PM_RUNTIME with CONFIG_PM in drivers/sh/pm_runtime.c.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

Note: This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if
PM_SLEEP is selected) which is only in linux-next at the moment (via the
linux-pm tree).

Please let me know if it is OK to take this one into linux-pm.

drivers/sh/pm_runtime.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-pm/drivers/sh/pm_runtime.c
--- linux-pm.orig/drivers/sh/pm_runtime.c
+++ linux-pm/drivers/sh/pm_runtime.c
@@ -20,7 +20,7 @@
#include <linux/bitmap.h>
#include <linux/slab.h>

+#ifdef CONFIG_PM
static int sh_pm_runtime_suspend(struct device *dev)
int ret;
@@ -68,7 +68,7 @@ static struct dev_pm_domain default_pm_d


-#endif /* CONFIG_PM_RUNTIME */
+#endif /* CONFIG_PM */

static struct pm_clk_notifier_block platform_bus_notifier = {

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/