aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-02-19 14:56:34 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-02-19 14:56:34 -0500
commit0b7164458fc184455239ea3676af1b362df1ce1d (patch)
tree6b968c6ec46e7a949e930de85f75afc337128b97 /Documentation
parent303c07db487be59ae9fda10600ea65ca11c21497 (diff)
parentb53cf458ea20dd7f5e32611366f63728e40c9021 (diff)
downloadlinux-0b7164458fc184455239ea3676af1b362df1ce1d.tar.gz
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 42e7f030cb1..284ced7a228 100644
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
@@ -107,8 +107,8 @@
!Finclude/net/cfg80211.h key_params
!Finclude/net/cfg80211.h survey_info_flags
!Finclude/net/cfg80211.h survey_info
-!Finclude/net/cfg80211.h beacon_parameters
-!Finclude/net/cfg80211.h plink_actions
+!Finclude/net/cfg80211.h cfg80211_beacon_data
+!Finclude/net/cfg80211.h cfg80211_ap_settings
!Finclude/net/cfg80211.h station_parameters
!Finclude/net/cfg80211.h station_info_flags
!Finclude/net/cfg80211.h rate_info_flags