diff --git a/[refs] b/[refs]
index 344e4e79f301..d6377eb379b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9a6ffffd05f97e6acbdeafc595e269855829751
+refs/heads/master: b3a902850a8f5bc11a660051faae707f928d4bd6
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index a38a82c785dd..daa539a4287b 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/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