aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/wlan-ng
diff options
context:
space:
mode:
authorMoritz Muehlenhoff <jmm@debian.org>2009-01-21 22:00:43 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:53:17 -0700
commit1f61379e82ab9319b99eb94963325ec766bcd752 (patch)
tree70580d21e32e403d5dd8da5a0c5eb214e513125e /drivers/staging/wlan-ng
parent3bd937af26599cfe7beddb10f9d66350e65b3526 (diff)
Staging: wlan-ng: Cleanup wlan_compat.h more
Move version identifier into p80211netdev.h and rename it to 0.3.0-staging to differentiate from the out-of-tree version. Also remove the unused wlan_ethconv declaration. Signed-off-by: Moritz Muehlenhoff <jmm@debian.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng')
-rw-r--r--drivers/staging/wlan-ng/p80211netdev.h2
-rw-r--r--drivers/staging/wlan-ng/wlan_compat.h7
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h
index 845c0280797..456f1d351aa 100644
--- a/drivers/staging/wlan-ng/p80211netdev.h
+++ b/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/drivers/staging/wlan-ng/wlan_compat.h b/drivers/staging/wlan-ng/wlan_compat.h
index 0fa1c6a8be1..a331d69f400 100644
--- a/drivers/staging/wlan-ng/wlan_compat.h
+++ b/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 <linux/hardirq.h>
#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 */