aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-09-02 13:30:07 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-09-02 13:30:07 -0400
commit78ab952717b62c0ba6ca7f7a27eaa0486685e45f (patch)
treea4ab2bfc578f279fc6847031f501d84c75057531 /Documentation
parentstarfire: Temporary kludge to fix powerpc build. (diff)
parentmac80211: only cancel software-based scans on suspend (diff)
downloadlinux-dev-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.tar.xz
linux-dev-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/DocBook/80211.tmpl1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl
index b84c9282828f..19a1210c2530 100644
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
@@ -65,7 +65,6 @@
</abstract>
</setinfo>
<book id="cfg80211-developers-guide">
-!Ainclude/net/cfg80211.h
<bookinfo>
<title>The cfg80211 subsystem</title>