From: Rafael J. Wysocki <rafael.j.wyso...@intel.com>
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 under
drivers/phy/.
Signed-off-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com>
---
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/phy/phy-omap-usb2.c | 2 +-
drivers/phy/phy-ti-pipe3.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: linux-pm/drivers/phy/phy-omap-usb2.c
===================================================================
--- linux-pm.orig/drivers/phy/phy-omap-usb2.c
+++ linux-pm/drivers/phy/phy-omap-usb2.c
@@ -322,7 +322,7 @@ static int omap_usb2_remove(struct platf
return 0;
}
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
static int omap_usb2_runtime_suspend(struct device *dev)
{
Index: linux-pm/drivers/phy/phy-ti-pipe3.c
===================================================================
--- linux-pm.orig/drivers/phy/phy-ti-pipe3.c
+++ linux-pm/drivers/phy/phy-ti-pipe3.c
@@ -423,7 +423,7 @@ static int ti_pipe3_remove(struct platfo
return 0;
}
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
static int ti_pipe3_runtime_suspend(struct device *dev)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
