From 4e3c52d4a7f640c034a3d3788704b20577f6d2f1 Mon Sep 17 00:00:00 2001
From: Reinette Chatre <reinette.chatre@intel.com>
Date: Thu, 30 Apr 2009 13:56:27 -0700
Subject: [PATCH] --- yaml --- r: 150175 b: refs/heads/master c:
 286d94906587901851906a5e2ddc09bc1a7ba1d9 h: refs/heads/master i:   150173:
 ecb72f0f7485ea4e2ba3073b44d812f31f65ee0b   150171:
 ec83164e3f40fa53ca1bfce3e053c2d23f7dc657   150167:
 5eb4c102180a46473913f233a5b40804f4ee378a   150159:
 ae9c6bc11912880d836ca16b52fcc28c9dd512fc   150143:
 c1dea862b0e501d7b64ac435b7096b827206e268 v: v3

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

diff --git a/[refs] b/[refs]
index f4de5a7942e4..ddfe92464769 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 722404983b9deb21e4f786224201ca2ab27a1c48
+refs/heads/master: 286d94906587901851906a5e2ddc09bc1a7ba1d9
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
index 0f21fc136ca7..1366222bb50a 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1298,8 +1298,7 @@ int iwl_setup_mac(struct iwl_priv *priv)
 	hw->flags = IEEE80211_HW_SIGNAL_DBM |
 		    IEEE80211_HW_NOISE_DBM |
 		    IEEE80211_HW_AMPDU_AGGREGATION |
-		    IEEE80211_HW_SPECTRUM_MGMT |
-		    IEEE80211_HW_SUPPORTS_PS;
+		    IEEE80211_HW_SPECTRUM_MGMT;
 	hw->wiphy->interface_modes =
 		BIT(NL80211_IFTYPE_STATION) |
 		BIT(NL80211_IFTYPE_ADHOC);