diff --git a/[refs] b/[refs]
index f007d284f62f..85d1779504f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea045ba02086c008505ab1a6a7a60856072be65f
+refs/heads/master: 96c5abd7f84272447a74c2a854c89f9cbd4018b2
diff --git a/trunk/drivers/staging/wlan-ng/p80211netdev.h b/trunk/drivers/staging/wlan-ng/p80211netdev.h
index ca65a4a9fb76..cbd02d2272e0 100644
--- a/trunk/drivers/staging/wlan-ng/p80211netdev.h
+++ b/trunk/drivers/staging/wlan-ng/p80211netdev.h
@@ -55,10 +55,14 @@
 
 #include <linux/interrupt.h>
 #include <linux/wireless.h>
+#include <linux/netdevice.h>
 
 /*================================================================*/
 /* Constants */
 
+#undef netdevice_t
+typedef struct net_device netdevice_t;
+
 #define WLAN_RELEASE	"0.3.0-staging"
 
 #define WLAN_DEVICE_CLOSED	0
diff --git a/trunk/drivers/staging/wlan-ng/wlan_compat.h b/trunk/drivers/staging/wlan-ng/wlan_compat.h
index 6ea47fc02cac..5c91332d2f61 100644
--- a/trunk/drivers/staging/wlan-ng/wlan_compat.h
+++ b/trunk/drivers/staging/wlan-ng/wlan_compat.h
@@ -48,9 +48,6 @@
 #ifndef _WLAN_COMPAT_H
 #define _WLAN_COMPAT_H
 
-#undef netdevice_t
-typedef struct net_device netdevice_t;
-
 /*=============================================================*/
 /*------ OS Portability Macros --------------------------------*/
 /*=============================================================*/