summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-14 23:14:36 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-15 15:12:21 +0100
commite8a9235c7c9257835a941ce89ea760ee95d94a70 (patch)
tree4344f72cbc7195deb8dc4147301bcba38a6559b9 /drivers/nfc
parent4f7ad5211eb4d331a54f3cc6832883e5e7e95eea (diff)
downloadop-kernel-dev-e8a9235c7c9257835a941ce89ea760ee95d94a70.zip
op-kernel-dev-e8a9235c7c9257835a941ce89ea760ee95d94a70.tar.gz
NFC / 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 in drivers/nfc/trf7970a.c. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/trf7970a.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
index d2ccd28..aa6a333 100644
--- a/drivers/nfc/trf7970a.c
+++ b/drivers/nfc/trf7970a.c
@@ -2154,7 +2154,7 @@ static int trf7970a_resume(struct device *dev)
}
#endif
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
static int trf7970a_pm_runtime_suspend(struct device *dev)
{
struct spi_device *spi = container_of(dev, struct spi_device, dev);
OpenPOWER on IntegriCloud