diff options
| author | David S. Miller | 2010-01-19 20:43:42 +0100 |
|---|---|---|
| committer | David S. Miller | 2010-01-19 20:43:42 +0100 |
| commit | 6373464288cab09bc641be301d8d30fc9f64ba71 (patch) | |
| tree | c1bc92dc630aa15da2e12bc0d09c92169817a702 /Documentation/DocBook | |
| parent | ipv4: allow warming up the ARP cache with request type gratuitous ARP (diff) | |
| parent | b43: N-PHY: drop unused definition, uncomment needed call (diff) | |
| download | kernel-qcow2-linux-6373464288cab09bc641be301d8d30fc9f64ba71.tar.gz kernel-qcow2-linux-6373464288cab09bc641be301d8d30fc9f64ba71.tar.xz kernel-qcow2-linux-6373464288cab09bc641be301d8d30fc9f64ba71.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/mac80211.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/mac80211.tmpl b/Documentation/DocBook/mac80211.tmpl index f3f37f141dbd..971d1c0c83e5 100644 --- a/Documentation/DocBook/mac80211.tmpl +++ b/Documentation/DocBook/mac80211.tmpl @@ -144,7 +144,7 @@ usage should require reading the full document. this though and the recommendation to allow only a single interface in STA mode at first! </para> -!Finclude/net/mac80211.h ieee80211_if_init_conf +!Finclude/net/mac80211.h ieee80211_vif </chapter> <chapter id="rx-tx"> |