diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-09-07 17:25:27 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-09-11 14:43:43 +0200 |
| commit | 3a6a0d8ee88d23e7dda28808c2c890c4db50ccb2 (patch) | |
| tree | 6b312f971bdb3afa6b852a49311b36c368c44529 /net | |
| parent | 1bad53824305807bb5cf49d6b588dd9d867586c6 (diff) | |
| download | linux-3.10-3a6a0d8ee88d23e7dda28808c2c890c4db50ccb2.tar.gz linux-3.10-3a6a0d8ee88d23e7dda28808c2c890c4db50ccb2.tar.bz2 linux-3.10-3a6a0d8ee88d23e7dda28808c2c890c4db50ccb2.zip | |
mac80211: remove unneeded CONFIG_PM ifdef
The functions are only called if CONFIG_PM is set
as the callers are under an ifdef, so there's no
need to also define no-op functions.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 887452327ba..d11a6f837d6 100644 --- a/net/mac80211/ieee80211_i.h +++ b/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 */ |