From: Johannes Berg Date: Wed, 18 Mar 2009 13:29:38 +0000 (+0100) Subject: mac80211: kill IEEE80211_CONF_SHORT_SLOT_TIME X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b3a902850a8f5bc11a660051faae707f928d4bd6;p=linux-2.6-omap-h63xx.git mac80211: kill IEEE80211_CONF_SHORT_SLOT_TIME No drivers use it any more, so it can now be removed safely. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville --- diff --git a/include/net/mac80211.h b/include/net/mac80211.h index a38a82c785d..daa539a4287 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -520,12 +520,6 @@ enum ieee80211_conf_flags { IEEE80211_CONF_PS = (1<<1), }; -/* XXX: remove all this once drivers stop trying to use it */ -static inline int __deprecated __IEEE80211_CONF_SHORT_SLOT_TIME(void) -{ - return 0; -} -#define IEEE80211_CONF_SHORT_SLOT_TIME (__IEEE80211_CONF_SHORT_SLOT_TIME()) /** * enum ieee80211_conf_changed - denotes which configuration changed