aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorMoritz Muehlenhoff <jmm@debian.org>2009-02-05 23:55:56 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:53:21 -0700
commit96c5abd7f84272447a74c2a854c89f9cbd4018b2 (patch)
tree2105e7c14599245891fc6bde6828f74d885707d8 /drivers/staging
parentea045ba02086c008505ab1a6a7a60856072be65f (diff)
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/wlan-ng/p80211netdev.h4
-rw-r--r--drivers/staging/wlan-ng/wlan_compat.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h
index ca65a4a9fb7..cbd02d2272e 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 6ea47fc02ca..5c91332d2f6 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 --------------------------------*/
/*=============================================================*/