diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-01-05 16:06:25 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-01-05 16:06:25 -0500 |
| commit | c96e96354a6c9456cdf1f150eca504e2ea35301e (patch) | |
| tree | 751bec601fb8152116b8e31e0f1f83d687a37d6f /drivers/net/wireless/wl12xx/boot.c | |
| parent | dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a (diff) | |
| parent | 33af88138b859f515b365a074e0a014d7cdbf846 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
net/bluetooth/Makefile
Diffstat (limited to 'drivers/net/wireless/wl12xx/boot.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/boot.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c index 4a9f929725fd..4df04f84d7f1 100644 --- a/drivers/net/wireless/wl12xx/boot.c +++ b/drivers/net/wireless/wl12xx/boot.c @@ -21,7 +21,6 @@ * */ -#include <linux/gpio.h> #include <linux/slab.h> #include "acx.h" |