From 93f4f426fc6081f513b614e8b223b9baa62d9959 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 4 Jun 2012 13:43:11 +0200
Subject: [PATCH] --- yaml --- r: 310735 b: refs/heads/master c:
 fcb6ff5e2cb83e1de10631f6621f45ca3401bf61 h: refs/heads/master i:   310733:
 77c78039440265ea129033880199199f1f538025   310731:
 2e7e306ac22ae0e4cd3be686af907e68f97dfcf2   310727:
 35b81021c3291d69baff43ef1ecc84430538be81   310719:
 7d9401728ada53ff014a8a266f9dcc98707bc228 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1396649ecb4e..7aaa67dcd0a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 794454ce72a298de6f4536ade597bdcc7dcde7c7
+refs/heads/master: fcb6ff5e2cb83e1de10631f6621f45ca3401bf61
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index ab2f4d7500a4..5d158ca9d246 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -199,6 +199,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
 			    WIPHY_FLAG_DISABLE_BEACON_HINTS |
 			    WIPHY_FLAG_IBSS_RSN;
 
+#ifdef CONFIG_PM_SLEEP
 	if (priv->fw->img[IWL_UCODE_WOWLAN].sec[0].len &&
 	    priv->trans->ops->wowlan_suspend &&
 	    device_can_wakeup(priv->trans->dev)) {
@@ -217,6 +218,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
 		hw->wiphy->wowlan.pattern_max_len =
 					IWLAGN_WOWLAN_MAX_PATTERN_LEN;
 	}
+#endif
 
 	if (iwlwifi_mod_params.power_save)
 		hw->wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;