From 5bc1d9f0f72e368239cd7fbc6712d3d38f868fcc Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 7 Sep 2012 17:25:27 +0200 Subject: [PATCH] --- yaml --- r: 328163 b: refs/heads/master c: 3a6a0d8ee88d23e7dda28808c2c890c4db50ccb2 h: refs/heads/master i: 328161: 81e130f5de909562e6fe9561e114869dcda05f0a 328159: bb94ea34a2e18fe8b0b374c6c281c3fad77ef1b1 v: v3 --- [refs] | 2 +- trunk/net/mac80211/ieee80211_i.h | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 274a84492be6..f80b3d312f67 100644 --- 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 index 887452327ba8..d11a6f837d69 100644 --- 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 */