aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/msm_serial_hs.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-13 00:41:36 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-13 00:41:36 +0100
commitd39fe4e557530f7c8368552074e93c3ae4b9c33f (patch)
treea97ad3ef10dc0f6404aa7cb17222672a6a774044 /drivers/tty/serial/msm_serial_hs.c
parentspi: Replace CONFIG_PM_RUNTIME with CONFIG_PM (diff)
downloadlinux-dev-d39fe4e557530f7c8368552074e93c3ae4b9c33f.tar.xz
linux-dev-d39fe4e557530f7c8368552074e93c3ae4b9c33f.zip
tty / 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/tty/. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/msm_serial_hs.c')
-rw-r--r--drivers/tty/serial/msm_serial_hs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index 48e94961a9e5..df68f334ab8b 100644
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -1792,7 +1792,7 @@ static void __exit msm_serial_hs_exit(void)
}
module_exit(msm_serial_hs_exit);
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
static int msm_hs_runtime_idle(struct device *dev)
{
/*