From 2f82ca7bf8ec204e2c96d1d60e29d1cf54510678 Mon Sep 17 00:00:00 2001 From: Venkat Gopalakrishnan Date: Wed, 20 Jan 2016 18:08:36 -0800 Subject: [PATCH] scsi: pm: Remove use of CONFIG_PM_RUNTIME CONFIG_PM_RUNTIME has been eliminated as of kernel 4.4 in favor of just using CONFIG_PM, hence remove its use. Change-Id: I096cde564c7bf2c7a041f0948617a7d74df71dd9 Signed-off-by: Venkat Gopalakrishnan --- drivers/scsi/scsi_pm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index 64d058c96d83..243b2d13fa0d 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c @@ -16,10 +16,8 @@ #include "scsi_priv.h" -#ifdef CONFIG_PM_RUNTIME static int do_scsi_runtime_resume(struct device *dev, const struct dev_pm_ops *pm); -#endif #ifdef CONFIG_PM_SLEEP