diff --git a/[refs] b/[refs]
index 9fb47958f5df..11c73e2510a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 323222b5ff930a43eab45cec6e58345740fa2a29
+refs/heads/master: 43a1c2721acd792aea370ee68ef054e18c944373
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index d3fe2d237485..05e3fb889d77 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/net/mac80211/util.c
@@ -1276,7 +1276,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 		if (ieee80211_sdata_running(sdata))
 			ieee80211_enable_keys(sdata);
 
+#ifdef CONFIG_PM
  wake_up:
+#endif
 	ieee80211_wake_queues_by_reason(hw,
 			IEEE80211_QUEUE_STOP_REASON_SUSPEND);