diff --git a/[refs] b/[refs]
index a2ce0cc0f806..05fbd33a49af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cebcbd752a2e8b3a4da1d554cc570fc5310af057
+refs/heads/master: fd90b3c1bab995f9225d8048d6d60e39dedac7ed
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h
index 8272a9489ab1..40186a61f20a 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -420,11 +420,6 @@ enum iwl_rxon_context_id {
 	NUM_IWL_RXON_CTX
 };
 
-#ifdef CONFIG_PM
-int iwl_suspend(struct iwl_priv *priv);
-int iwl_resume(struct iwl_priv *priv);
-#endif /* !CONFIG_PM */
-
 int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,
 		struct iwl_cfg *cfg);
 void __devexit iwl_remove(struct iwl_priv * priv);