diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-04-30 12:04:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-04-30 12:04:27 -0400 |
| commit | f6595444c1ee798f9c227107bb3ab14730c6497a (patch) | |
| tree | e8e06d7c2057c69e19848ee3abd6720927f5f9f9 /Documentation | |
| parent | 0006433a5be9e0e155ad493e33c6e9bf3868a87f (diff) | |
| parent | f55ee0834247c88cb6981cb11eb1870392878371 (diff) | |
| download | op-kernel-dev-f6595444c1ee798f9c227107bb3ab14730c6497a.zip op-kernel-dev-f6595444c1ee798f9c227107bb3ab14730c6497a.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
net/mac80211/chan.c
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 044b764..d9b9416 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> |
