diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-02 13:47:50 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-02 13:47:50 -0400 |
| commit | 406a94d7fae94a893c3afb9c2d18c83124d3cd9b (patch) | |
| tree | c81f4de219ff9309a3f8f60c7855a620b8598ef4 /Documentation/DocBook | |
| parent | c25aaf814a63f9d9c4e45416f13d70ef0aa0be2e (diff) | |
| parent | 48d11dc37977614a461bfedddc52d1c651bc279f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'Documentation/DocBook')
| -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 044b76436e83..d9b9416c989f 100644 --- a/Documentation/DocBook/80211.tmpl +++ b/Documentation/DocBook/80211.tmpl | |||
| @@ -100,6 +100,7 @@ | |||
| 100 | !Finclude/net/cfg80211.h wdev_priv | 100 | !Finclude/net/cfg80211.h wdev_priv |
| 101 | !Finclude/net/cfg80211.h ieee80211_iface_limit | 101 | !Finclude/net/cfg80211.h ieee80211_iface_limit |
| 102 | !Finclude/net/cfg80211.h ieee80211_iface_combination | 102 | !Finclude/net/cfg80211.h ieee80211_iface_combination |
| 103 | !Finclude/net/cfg80211.h cfg80211_check_combinations | ||
| 103 | </chapter> | 104 | </chapter> |
| 104 | <chapter> | 105 | <chapter> |
| 105 | <title>Actions and configuration</title> | 106 | <title>Actions and configuration</title> |