From 402c852862994cbe19ff586cffda9f18f7bca137 Mon Sep 17 00:00:00 2001 From: Moritz Muehlenhoff Date: Thu, 5 Feb 2009 23:55:56 +0100 Subject: [PATCH] --- yaml --- r: 141191 b: refs/heads/master c: 96c5abd7f84272447a74c2a854c89f9cbd4018b2 h: refs/heads/master i: 141189: 147673cbd353fc2414d57ee9d6cd05f5680acb05 141187: ee26bf5f7652df16527b9b2a71e87e6b4b8a1c4f 141183: 27ffa9d71f8043470fa1c4d3c058bc34540da655 v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlan-ng/p80211netdev.h | 4 ++++ trunk/drivers/staging/wlan-ng/wlan_compat.h | 3 --- 3 files changed, 5 insertions(+), 4 deletions(-) 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 #include +#include /*================================================================*/ /* 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 --------------------------------*/ /*=============================================================*/