aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00dev.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2008-03-27 19:54:13 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-04-01 17:13:17 -0400
commit3480a58a90cd505578b9979d878a5ad9c347d424 (patch)
treeaf0d9f8103e1a782d78ef522272b838e2d4c92d3 /drivers/net/wireless/rt2x00/rt2x00dev.c
parent04850a47aa7d03cbf651a91262fdaa9f18373dfc (diff)
rt2x00: fixup some non-functional merge errors
These small changes restore the rt2x00 sources to the way Ivo intended. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00dev.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index f52e92512f90..d2c096708e8c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1194,10 +1194,6 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
1194 */ 1194 */
1195 rt2x00debug_deregister(rt2x00dev); 1195 rt2x00debug_deregister(rt2x00dev);
1196 rt2x00rfkill_free(rt2x00dev); 1196 rt2x00rfkill_free(rt2x00dev);
1197
1198 /*
1199 * Free LED.
1200 */
1201 rt2x00leds_unregister(rt2x00dev); 1197 rt2x00leds_unregister(rt2x00dev);
1202 1198
1203 /* 1199 /*