Staging: w35und: remove gl_80211.h header

The gl_80211.h header file contains only two definitions that are actually used. Move them to mds_s.h and remove the otherwise unused file. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
git-mirror · Apr 3, 2009 · 4bb5a7e · 4bb5a7e
1 parent 3b05574
commit 4bb5a7e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 128 deletions.
diff --git a/drivers/staging/winbond/gl_80211.h b/drivers/staging/winbond/gl_80211.h
diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c
@@ -1,4 +1,3 @@
-#include "gl_80211.h"
 #include "mds_f.h"
 #include "mlmetxrx_f.h"
 #include "mto.h"

diff --git a/drivers/staging/winbond/mds_s.h b/drivers/staging/winbond/mds_s.h
@@ -9,6 +9,12 @@
 #include "mac_structures.h"
 #include "scan_s.h"
 
+/* Preamble_Type, see <SFS-802.11G-MIB-203> */
+enum {
+	WLAN_PREAMBLE_TYPE_SHORT,
+	WLAN_PREAMBLE_TYPE_LONG,
+};
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 #define MAX_USB_TX_DESCRIPTOR		15		// IS89C35 ability
 #define MAX_USB_TX_BUFFER_NUMBER	4		// Virtual pre-buffer number of MAX_USB_TX_BUFFER

diff --git a/drivers/staging/winbond/mto.c b/drivers/staging/winbond/mto.c
@@ -24,7 +24,6 @@
 // LA20040210_DTO kevin
 #include "sysdef.h"
 #include "sme_api.h"
-#include "gl_80211.h"
 #include "wbhal_f.h"
 
 // Declare SQ3 to rate and fragmentation threshold table