diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-29 14:08:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-29 14:08:24 -0400 |
| commit | 0d8165e9fca119b804de2cf35674e07c36c9704f (patch) | |
| tree | 3d66d027b502b6fdb98666a9121c7f52b48c657d /Documentation | |
| parent | 4c9d546f6c522f541dfb01e192ab7101eca0053b (diff) | |
| parent | 076f0d20b636ef0e701e21e701c0631b5757b732 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/80211.tmpl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl index 49267ea97568..f403ec3c5c9a 100644 --- a/Documentation/DocBook/80211.tmpl +++ b/Documentation/DocBook/80211.tmpl | |||
| @@ -325,6 +325,7 @@ | |||
| 325 | <title>functions/definitions</title> | 325 | <title>functions/definitions</title> |
| 326 | !Finclude/net/mac80211.h ieee80211_rx_status | 326 | !Finclude/net/mac80211.h ieee80211_rx_status |
| 327 | !Finclude/net/mac80211.h mac80211_rx_flags | 327 | !Finclude/net/mac80211.h mac80211_rx_flags |
| 328 | !Finclude/net/mac80211.h mac80211_tx_info_flags | ||
| 328 | !Finclude/net/mac80211.h mac80211_tx_control_flags | 329 | !Finclude/net/mac80211.h mac80211_tx_control_flags |
| 329 | !Finclude/net/mac80211.h mac80211_rate_control_flags | 330 | !Finclude/net/mac80211.h mac80211_rate_control_flags |
| 330 | !Finclude/net/mac80211.h ieee80211_tx_rate | 331 | !Finclude/net/mac80211.h ieee80211_tx_rate |