From 6b125032db1b0a3018c86bb97314e8dcf3093b81 Mon Sep 17 00:00:00 2001 From: Moritz Muehlenhoff Date: Wed, 21 Jan 2009 22:00:43 +0100 Subject: [PATCH] --- yaml --- r: 141160 b: refs/heads/master c: 1f61379e82ab9319b99eb94963325ec766bcd752 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlan-ng/p80211netdev.h | 2 ++ trunk/drivers/staging/wlan-ng/wlan_compat.h | 7 ------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 081af16abd58..57f25ee78ae6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bd937af26599cfe7beddb10f9d66350e65b3526 +refs/heads/master: 1f61379e82ab9319b99eb94963325ec766bcd752 diff --git a/trunk/drivers/staging/wlan-ng/p80211netdev.h b/trunk/drivers/staging/wlan-ng/p80211netdev.h index 845c02807976..456f1d351aa1 100644 --- a/trunk/drivers/staging/wlan-ng/p80211netdev.h +++ b/trunk/drivers/staging/wlan-ng/p80211netdev.h @@ -59,6 +59,8 @@ /*================================================================*/ /* Constants */ +#define WLAN_RELEASE "0.3.0-staging" + #define WLAN_DEVICE_CLOSED 0 #define WLAN_DEVICE_OPEN 1 diff --git a/trunk/drivers/staging/wlan-ng/wlan_compat.h b/trunk/drivers/staging/wlan-ng/wlan_compat.h index 0fa1c6a8be18..a331d69f4003 100644 --- a/trunk/drivers/staging/wlan-ng/wlan_compat.h +++ b/trunk/drivers/staging/wlan-ng/wlan_compat.h @@ -93,8 +93,6 @@ #define WLAN_DBVAR wlan_debug #endif -#define WLAN_RELEASE "0.3.0-lkml" - #include #define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __func__ , ##args); @@ -179,10 +177,5 @@ typedef struct net_device netdevice_t; extern int wlan_debug; #endif -extern int wlan_ethconv; /* What's the default ethconv? */ - -/*=============================================================*/ -/*--- Functions -----------------------------------------------*/ -/*=============================================================*/ #endif /* _WLAN_COMPAT_H */