diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-13 00:42:12 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-13 00:42:12 +0100 |
| commit | 7ba37053ebcc59e96b2677d42a2ee08b6c217d25 (patch) | |
| tree | 6e7d087dc182c30992e464b8810fed4744f15d09 | |
| parent | video / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM (diff) | |
| download | linux-7ba37053ebcc59e96b2677d42a2ee08b6c217d25.tar.xz linux-7ba37053ebcc59e96b2677d42a2ee08b6c217d25.zip | |
phy / 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 under
drivers/phy/.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
| -rw-r--r-- | drivers/phy/phy-omap-usb2.c | 2 | ||||
| -rw-r--r-- | drivers/phy/phy-ti-pipe3.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c index f091576b6449..48990e735759 100644 --- a/drivers/phy/phy-omap-usb2.c +++ b/drivers/phy/phy-omap-usb2.c @@ -322,7 +322,7 @@ static int omap_usb2_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int omap_usb2_runtime_suspend(struct device *dev) { diff --git a/drivers/phy/phy-ti-pipe3.c b/drivers/phy/phy-ti-pipe3.c index ab1e22d9a1e8..7c66922b2f93 100644 --- a/drivers/phy/phy-ti-pipe3.c +++ b/drivers/phy/phy-ti-pipe3.c @@ -423,7 +423,7 @@ static int ti_pipe3_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int ti_pipe3_runtime_suspend(struct device *dev) { |