Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[pandora-kernel.git] / drivers / net / wireless / libertas / wext.h

diff --git a/drivers/net/wireless/libertas/wext.h b/drivers/net/wireless/libertas/wext.h
index 6aa444c..4c08db4 100644 (file)
--- a/drivers/net/wireless/libertas/wext.h
+++ b/drivers/net/wireless/libertas/wext.h
@@ -1,23 +1,10 @@
 /**
   * This file contains definition for IOCTL call.
   */
-#ifndef        _WLAN_WEXT_H_
-#define        _WLAN_WEXT_H_
+#ifndef        _LBS_WEXT_H_
+#define        _LBS_WEXT_H_
 
-/** wlan_ioctl_regrdwr */
-struct wlan_ioctl_regrdwr {
-       /** Which register to access */
-       u16 whichreg;
-       /** Read or Write */
-       u16 action;
-       u32 offset;
-       u16 NOB;
-       u32 value;
-};
-
-#define WLAN_MONITOR_OFF                       0
-
-extern struct iw_handler_def libertas_handler_def;
+extern struct iw_handler_def lbs_handler_def;
 extern struct iw_handler_def mesh_handler_def;
 
-#endif                         /* _WLAN_WEXT_H_ */
+#endif