---

yaml --- r: 328163 b: refs/heads/master c: 3a6a0d8 h: refs/heads/master i: 328161: 81e130f 328159: bb94ea3 v: v3
git-mirror · Sep 11, 2012 · 5bc1d9f · 5bc1d9f
1 parent 3a0d723
commit 5bc1d9f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bad53824305807bb5cf49d6b588dd9d867586c6
+refs/heads/master: 3a6a0d8ee88d23e7dda28808c2c890c4db50ccb2
diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/net/mac80211/ieee80211_i.h
@@ -1368,7 +1368,6 @@ void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,
 int ieee80211_reconfig(struct ieee80211_local *local);
 void ieee80211_stop_device(struct ieee80211_local *local);
 
-#ifdef CONFIG_PM
 int __ieee80211_suspend(struct ieee80211_hw *hw,
 			struct cfg80211_wowlan *wowlan);
 
@@ -1382,18 +1381,6 @@ static inline int __ieee80211_resume(struct ieee80211_hw *hw)
 
 	return ieee80211_reconfig(hw_to_local(hw));
 }
-#else
-static inline int __ieee80211_suspend(struct ieee80211_hw *hw,
-				      struct cfg80211_wowlan *wowlan)
-{
-	return 0;
-}
-
-static inline int __ieee80211_resume(struct ieee80211_hw *hw)
-{
-	return 0;
-}
-#endif
 
 /* utility functions/constants */
 extern void *mac80211_wiphy_privid; /* for wiphy privid */