aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorGravatar John W. Linville <linville@tuxdriver.com> 2013-11-08 09:03:10 -0500
committerGravatar John W. Linville <linville@tuxdriver.com> 2013-11-08 09:03:10 -0500
commitc1f3bb6bd317994beb3af7bbec4bf54ed0035509 (patch)
tree878833c714ddcb35f1574f2b11e1f69d1130d206 /Documentation
parentinet: fix a UFO regression (diff)
parentath9k: enable DFS for IBSS mode (diff)
downloadlinux-c1f3bb6bd317994beb3af7bbec4bf54ed0035509.tar.gz
linux-c1f3bb6bd317994beb3af7bbec4bf54ed0035509.tar.bz2
linux-c1f3bb6bd317994beb3af7bbec4bf54ed0035509.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/DocBook/80211.tmpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl
index f403ec3c5c9a..46ad6faee9ab 100644
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
@@ -152,8 +152,8 @@
!Finclude/net/cfg80211.h cfg80211_scan_request
!Finclude/net/cfg80211.h cfg80211_scan_done
!Finclude/net/cfg80211.h cfg80211_bss
-!Finclude/net/cfg80211.h cfg80211_inform_bss_frame
-!Finclude/net/cfg80211.h cfg80211_inform_bss
+!Finclude/net/cfg80211.h cfg80211_inform_bss_width_frame
+!Finclude/net/cfg80211.h cfg80211_inform_bss_width
!Finclude/net/cfg80211.h cfg80211_unlink_bss
!Finclude/net/cfg80211.h cfg80211_find_ie
!Finclude/net/cfg80211.h ieee80211_bss_get_ie