summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-05-02 21:47:50 +0400
committerJohn W. Linville <linville@tuxdriver.com>2014-05-02 21:47:50 +0400
commit406a94d7fae94a893c3afb9c2d18c83124d3cd9b (patch)
treec81f4de219ff9309a3f8f60c7855a620b8598ef4 /Documentation
parentc25aaf814a63f9d9c4e45416f13d70ef0aa0be2e (diff)
parent48d11dc37977614a461bfedddc52d1c651bc279f (diff)
downloadlinux-406a94d7fae94a893c3afb9c2d18c83124d3cd9b.tar.xz
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.tmpl1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl
index 044b76436e83..d9b9416c989f 100644
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
@@ -100,6 +100,7 @@
!Finclude/net/cfg80211.h wdev_priv
!Finclude/net/cfg80211.h ieee80211_iface_limit
!Finclude/net/cfg80211.h ieee80211_iface_combination
+!Finclude/net/cfg80211.h cfg80211_check_combinations
</chapter>
<chapter>
<title>Actions and configuration</title>