Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[~andy/linux] / drivers / net / wireless / wl3501_cs.c

diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 98fbf54f6004144e832f713034728a8b302c45ee..00f6e69c1dcd6f47e3f1e916cf26f923b9f0e1ea 100644 (file)
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -53,7 +53,6 @@
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/system.h>
 
 #include "wl3501.h"