diff options
author | David S. Miller <davem@davemloft.net> | 2009-07-10 05:18:24 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-10 05:18:24 +0200 |
commit | e5a8a896f5180f2950695d2d0b79db348d200ca4 (patch) | |
tree | 04adc57ae51a6d30a89ffae970770b81ee81fc23 /Documentation | |
parent | netpoll: Introduce netpoll_carrier_timeout kernel option (diff) | |
parent | cxgb3: Fix crash caused by stashing wrong netdev_queue (diff) | |
download | linux-e5a8a896f5180f2950695d2d0b79db348d200ca4.tar.xz linux-e5a8a896f5180f2950695d2d0b79db348d200ca4.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/DocBook/mac80211.tmpl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/DocBook/mac80211.tmpl b/Documentation/DocBook/mac80211.tmpl index e36986663570..f3f37f141dbd 100644 --- a/Documentation/DocBook/mac80211.tmpl +++ b/Documentation/DocBook/mac80211.tmpl @@ -184,8 +184,6 @@ usage should require reading the full document. !Finclude/net/mac80211.h ieee80211_ctstoself_get !Finclude/net/mac80211.h ieee80211_ctstoself_duration !Finclude/net/mac80211.h ieee80211_generic_frame_duration -!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb -!Finclude/net/mac80211.h ieee80211_hdrlen !Finclude/net/mac80211.h ieee80211_wake_queue !Finclude/net/mac80211.h ieee80211_stop_queue !Finclude/net/mac80211.h ieee80211_wake_queues |