struct b43_wldev;
+--- a/drivers/net/wireless/wl12xx/wl1251_boot.c
++++ b/drivers/net/wireless/wl12xx/wl1251_boot.c
+@@ -19,7 +19,6 @@
+ *
+ */
+
+-#include <linux/gpio.h>
+ #include <linux/slab.h>
+
+ #include "wl1251_reg.h"
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
-@@ -26,6 +26,9 @@
+@@ -24,6 +24,9 @@
#include <linux/firmware.h>
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/vmalloc.h>
--- a/drivers/net/wireless/wl12xx/wl1251_spi.c
+++ b/drivers/net/wireless/wl12xx/wl1251_spi.c
-@@ -25,6 +25,9 @@
+@@ -23,6 +23,9 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/crc7.h>
#include <linux/spi/spi.h>
#include <linux/spi/wl12xx.h>
+--- a/drivers/net/wireless/wl12xx/wl1271_boot.c
++++ b/drivers/net/wireless/wl12xx/wl1271_boot.c
+@@ -21,7 +21,6 @@
+ *
+ */
+
+-#include <linux/gpio.h>
+ #include <linux/slab.h>
+
+ #include "wl1271_acx.h"
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -22,6 +22,9 @@