From 14cfd9ac934ff5437a3210cc54c749c8560cbb62 Mon Sep 17 00:00:00 2001
From: Jingoo Han <jg1.han@samsung.com>
Date: Tue, 26 Mar 2013 16:01:38 +0900
Subject: [PATCH] --- yaml --- r: 367411 b: refs/heads/master c:
 4eeb587e4b62749c544e0e3bf62c0934d1b3852b h: refs/heads/master i:   367409:
 ee18b4112498afbe9aef05ad1c51d940cf3679b4   367407:
 dccf8826ca70a41458cca9fc0a7be35605a8971d v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/scsi/isci/init.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b5d4b37c6d19..f0b3d4d97a43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a3ad3920de780e3da1dacabe3c0abcd5b260655
+refs/heads/master: 4eeb587e4b62749c544e0e3bf62c0934d1b3852b
diff --git a/trunk/drivers/scsi/isci/init.c b/trunk/drivers/scsi/isci/init.c
index 2839baa82a5a..d25d0d859f05 100644
--- a/trunk/drivers/scsi/isci/init.c
+++ b/trunk/drivers/scsi/isci/init.c
@@ -721,7 +721,7 @@ static void isci_pci_remove(struct pci_dev *pdev)
 	}
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int isci_suspend(struct device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev);
@@ -770,18 +770,16 @@ static int isci_resume(struct device *dev)
 
 	return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(isci_pm_ops, isci_suspend, isci_resume);
-#endif
 
 static struct pci_driver isci_pci_driver = {
 	.name		= DRV_NAME,
 	.id_table	= isci_id_table,
 	.probe		= isci_pci_probe,
 	.remove		= isci_pci_remove,
-#ifdef CONFIG_PM
 	.driver.pm      = &isci_pm_ops,
-#endif
 };
 
 static __init int isci_init(void)