From fb853285ca4f9d2986d738bafc5647839a752bd9 Mon Sep 17 00:00:00 2001
From: Daniel Halperin <dhalperi@cs.washington.edu>
Date: Thu, 25 Aug 2011 23:11:15 -0700
Subject: [PATCH] --- yaml --- r: 265872 b: refs/heads/master c:
 f090fba305658fe6e464e2fbd25fad81957ece26 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-pci.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b2f40c24cc58..4ff1fa16d256 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83ed90155f98bd949735c2cc22d832b557a6d7d1
+refs/heads/master: f090fba305658fe6e464e2fbd25fad81957ece26
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c b/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c
index 17f3fb241b6f..62c35a5fea80 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -506,7 +506,7 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
 	iwl_pci_down(bus);
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 
 static int iwl_pci_suspend(struct device *device)
 {