Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / staging / winbond / core.h

diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h
index fe142a10ea80ea5df00fcbc35736bfc318530bdf..eb4c090972c01de460bbe456ccd726150b97d42e 100644 (file)
--- a/drivers/staging/winbond/core.h
+++ b/drivers/staging/winbond/core.h
@@ -3,9 +3,9 @@
 
 #include <linux/wireless.h>
 
-#include "bssdscpt.h"
-#include "mto.h"
+#include "mlme_s.h"
 #include "wbhal_s.h"
+#include "mto.h"
 
 #define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4)
 
@@ -15,12 +15,11 @@ struct wbsoft_priv {
        u32 adapterIndex;       // 20060703.4 Add for using padapterContext global adapter point
 
        WB_LOCALDESCRIPT sLocalPara;    // Myself connected parameters
-       PWB_BSSDESCRIPTION asBSSDescriptElement;
 
        MLME_FRAME sMlmeFrame;  // connect to peerSTA parameters
 
        MTO_PARAMETERS sMtoPara;        // MTO_struct ...
-       hw_data_t sHwData;      //For HAL
+       struct hw_data sHwData; //For HAL
        MDS Mds;
 
        spinlock_t SpinLock;