diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-19 14:43:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-19 14:43:42 -0500 |
| commit | 6373464288cab09bc641be301d8d30fc9f64ba71 (patch) | |
| tree | c1bc92dc630aa15da2e12bc0d09c92169817a702 /Documentation | |
| parent | 6d955180b2f9ccff444df06265160868cabb289a (diff) | |
| parent | 730dd70549e0ec755dd55615ba5cfc38a482a947 (diff) | |
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')
| -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. | |||
| 144 | this though and the recommendation to allow only a single | 144 | this though and the recommendation to allow only a single |
| 145 | interface in STA mode at first! | 145 | interface in STA mode at first! |
| 146 | </para> | 146 | </para> |
| 147 | !Finclude/net/mac80211.h ieee80211_if_init_conf | 147 | !Finclude/net/mac80211.h ieee80211_vif |
| 148 | </chapter> | 148 | </chapter> |
| 149 | 149 | ||
| 150 | <chapter id="rx-tx"> | 150 | <chapter id="rx-tx"> |