diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-09 23:18:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-09 23:18:24 -0400 |
| commit | e5a8a896f5180f2950695d2d0b79db348d200ca4 (patch) | |
| tree | 04adc57ae51a6d30a89ffae970770b81ee81fc23 /Documentation | |
| parent | bff38771e1065c7fc3de87e47ba366151eea573c (diff) | |
| parent | e594e96e8a14101a6decabf6746bd5186287debc (diff) | |
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. | |||
| 184 | !Finclude/net/mac80211.h ieee80211_ctstoself_get | 184 | !Finclude/net/mac80211.h ieee80211_ctstoself_get |
| 185 | !Finclude/net/mac80211.h ieee80211_ctstoself_duration | 185 | !Finclude/net/mac80211.h ieee80211_ctstoself_duration |
| 186 | !Finclude/net/mac80211.h ieee80211_generic_frame_duration | 186 | !Finclude/net/mac80211.h ieee80211_generic_frame_duration |
| 187 | !Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb | ||
| 188 | !Finclude/net/mac80211.h ieee80211_hdrlen | ||
| 189 | !Finclude/net/mac80211.h ieee80211_wake_queue | 187 | !Finclude/net/mac80211.h ieee80211_wake_queue |
| 190 | !Finclude/net/mac80211.h ieee80211_stop_queue | 188 | !Finclude/net/mac80211.h ieee80211_stop_queue |
| 191 | !Finclude/net/mac80211.h ieee80211_wake_queues | 189 | !Finclude/net/mac80211.h ieee80211_wake_queues |