diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-17 16:57:35 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-17 16:57:35 +1100 |
| commit | 0ff2d19d39f29acf6a8c86f9e5bb8aaf4fe4d95e (patch) | |
| tree | 0f833d94252d7eda983da632917b104616e16037 /net/mac80211/ieee80211_rate.h | |
| parent | 8757b299262f0e87f62480657f64d954967b1630 (diff) | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
Merge commit 'wireless/master'
Conflicts:
MAINTAINERS
Diffstat (limited to 'net/mac80211/ieee80211_rate.h')
| -rw-r--r-- | net/mac80211/ieee80211_rate.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/net/mac80211/ieee80211_rate.h b/net/mac80211/ieee80211_rate.h index bfd0a1982e4a..5b45f33cb766 100644 --- a/net/mac80211/ieee80211_rate.h +++ b/net/mac80211/ieee80211_rate.h @@ -171,21 +171,6 @@ void rate_control_deinitialize(struct ieee80211_local *local); /* Rate control algorithms */ -#if defined(RC80211_SIMPLE_COMPILE) || \ - (defined(CONFIG_MAC80211_RC_SIMPLE) && \ - !defined(CONFIG_MAC80211_RC_SIMPLE_MODULE)) -extern int rc80211_simple_init(void); -extern void rc80211_simple_exit(void); -#else -static inline int rc80211_simple_init(void) -{ - return 0; -} -static inline void rc80211_simple_exit(void) -{ -} -#endif - #if defined(RC80211_PID_COMPILE) || \ (defined(CONFIG_MAC80211_RC_PID) && \ !defined(CONFIG_MAC80211_RC_PID_MODULE)) |