From: Moritz Muehlenhoff <jmm@debian.org>
Date: Thu, 5 Feb 2009 22:55:56 +0000 (+0100)
Subject: Staging: wlan-ng: Move netdevice_t typedef into p80211netdev.h
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=96c5abd7f84272447a74c2a854c89f9cbd4018b2;p=deliverable%2Flinux.git

Staging: wlan-ng: Move netdevice_t typedef into p80211netdev.h

Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h
index ca65a4a9fb76..cbd02d2272e0 100644
--- a/drivers/staging/wlan-ng/p80211netdev.h
+++ b/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/drivers/staging/wlan-ng/wlan_compat.h b/drivers/staging/wlan-ng/wlan_compat.h
index 6ea47fc02cac..5c91332d2f61 100644
--- a/drivers/staging/wlan-ng/wlan_compat.h
+++ b/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 --------------------------------*/
 /*=============================================================*/