Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / nfc / trf7970a.c

diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
index d2ccd289064739a17c9463e4698eab84ce716b64..aa6a333b2ead9e4f4c0ad7eef5659681f96eec49 100644 (file)
--- 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);