ath5k: fix build break from "ath5k: Print out opmode in debugfs"

[net-next-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2fde65d66f51fe9d34e881cea0cd2ef29561da5c..339606e0a78158bf6386f85238c50cd3e2daf237 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1102,6 +1102,13 @@ W:       http://wireless.kernel.org/en/users/Drivers/ar9170
 S:     Maintained
 F:     drivers/net/wireless/ath/ar9170/
 
+CARL9170 LINUX COMMUNITY WIRELESS DRIVER
+M:     Christian Lamparter <chunkeey@googlemail.com>
+L:     linux-wireless@vger.kernel.org
+W:     http://wireless.kernel.org/en/users/Drivers/carl9170
+S:     Maintained
+F:     drivers/net/wireless/ath/carl9170/
+
 ATK0110 HWMON DRIVER
 M:     Luca Tettamanti <kronos.it@gmail.com>
 L:     lm-sensors@lm-sensors.org
@@ -4548,7 +4555,7 @@ F:        include/linux/preempt.h
 PRISM54 WIRELESS DRIVER
 M:     "Luis R. Rodriguez" <mcgrof@gmail.com>
 L:     linux-wireless@vger.kernel.org
-W:     http://prism54.org
+W:     http://wireless.kernel.org/en/users/Drivers/p54
 S:     Obsolete
 F:     drivers/net/wireless/prism54/
 
@@ -6307,16 +6314,16 @@ L:      linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
-F:     drivers/net/wireless/wl12xx/*
-X:     drivers/net/wireless/wl12xx/wl1271*
+F:     drivers/net/wireless/wl1251/*
 
 WL1271 WIRELESS DRIVER
 M:     Luciano Coelho <luciano.coelho@nokia.com>
 L:     linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
 S:     Maintained
 F:     drivers/net/wireless/wl12xx/wl1271*
+F:     include/linux/wl12xx.h
 
 WL3501 WIRELESS PCMCIA CARD DRIVER
 M:     Arnaldo Carvalho de Melo <acme@ghostprotocols.net>