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 | |
| parent | hyperv: Enable sendbuf mechanism on the send path (diff) | |
| parent | rsi: Changing opcode for sta mode according to changes in firmware (diff) | |
| download | linux-dev-406a94d7fae94a893c3afb9c2d18c83124d3cd9b.tar.xz linux-dev-406a94d7fae94a893c3afb9c2d18c83124d3cd9b.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.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 @@ !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> |