summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-02-24 21:03:32 +0100
committerJohn W. Linville <linville@tuxdriver.com>2014-02-24 21:03:32 +0100
commitc77986c78aa941af8266272841567e78b72d54cc (patch)
treecb30e1bd7d5799bfce5a3837bcfddee059a81733 /Documentation
parentMerge branch 'for-linville' of git://github.com/kvalo/ath (diff)
parentmac80211: ibss: handle cfg80211_chandef_dfs_required() error codes (diff)
downloadlinux-c77986c78aa941af8266272841567e78b72d54cc.tar.xz
linux-c77986c78aa941af8266272841567e78b72d54cc.zip
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/DocBook/80211.tmpl2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl
index 46ad6faee9ab..044b76436e83 100644
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
@@ -98,6 +98,8 @@
!Finclude/net/cfg80211.h priv_to_wiphy
!Finclude/net/cfg80211.h set_wiphy_dev
!Finclude/net/cfg80211.h wdev_priv
+!Finclude/net/cfg80211.h ieee80211_iface_limit
+!Finclude/net/cfg80211.h ieee80211_iface_combination
</chapter>
<chapter>
<title>Actions and configuration</title>