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>

diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h
index 845c02807976445e94cf2cee0455e22081a8a6c9..456f1d351aa1f02fc2ea337a76487f9858c24d61 100644 (file)
--- 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 0fa1c6a8be18f399dcce469565bbd67d86243704..a331d69f4003f49a50bbc1d666c510264a3613b4 100644 (file)
--- 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 */