summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1251_tx.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-09-02 19:30:07 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-09-02 19:30:07 +0200
commit78ab952717b62c0ba6ca7f7a27eaa0486685e45f (patch)
treea4ab2bfc578f279fc6847031f501d84c75057531 /drivers/net/wireless/wl12xx/wl1251_tx.h
parentstarfire: Temporary kludge to fix powerpc build. (diff)
parentmac80211: only cancel software-based scans on suspend (diff)
downloadlinux-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.tar.xz
linux-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 'drivers/net/wireless/wl12xx/wl1251_tx.h')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_tx.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_tx.h b/drivers/net/wireless/wl12xx/wl1251_tx.h
index f40eeb37f5aa..96011e78cd5a 100644
--- a/drivers/net/wireless/wl12xx/wl1251_tx.h
+++ b/drivers/net/wireless/wl12xx/wl1251_tx.h
@@ -4,8 +4,6 @@
* Copyright (c) 1998-2007 Texas Instruments Incorporated
* Copyright (C) 2008 Nokia Corporation
*
- * Contact: Kalle Valo <kalle.valo@nokia.com>
- *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.