diff --git a/[refs] b/[refs] index 5ccf11aeda28..b436d05bb303 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c093865aecc7addd34a56b5cf4b2ee9223d9b2d +refs/heads/master: 89b32d45fe88884d4780057dd18a098b402e358c diff --git a/trunk/drivers/staging/winbond/core.h b/trunk/drivers/staging/winbond/core.h index 294d371e60d2..333b19735734 100644 --- a/trunk/drivers/staging/winbond/core.h +++ b/trunk/drivers/staging/winbond/core.h @@ -1,7 +1,6 @@ #ifndef __WINBOND_CORE_H #define __WINBOND_CORE_H -#include #include #include @@ -21,8 +20,6 @@ struct mlme_frame { u8 DataType; u8 IsInUsed; - spinlock_t MLMESpinLock; - u8 TxMMPDU[MAX_NUM_TX_MMPDU][MAX_MMPDU_SIZE]; u8 TxMMPDUInUse[(MAX_NUM_TX_MMPDU + 3) & ~0x03]; @@ -57,8 +54,6 @@ struct wbsoft_priv { struct hw_data sHwData; /*For HAL */ struct wb35_mds Mds; - spinlock_t SpinLock; - atomic_t ThreadCount; u32 RxByteCount; diff --git a/trunk/drivers/staging/winbond/wbusb.c b/trunk/drivers/staging/winbond/wbusb.c index abaa05a630f0..5419f4fd198f 100644 --- a/trunk/drivers/staging/winbond/wbusb.c +++ b/trunk/drivers/staging/winbond/wbusb.c @@ -783,8 +783,6 @@ static int wb35_probe(struct usb_interface *intf, priv = dev->priv; - spin_lock_init(&priv->SpinLock); - pWbUsb = &priv->sHwData.WbUsb; pWbUsb->udev = udev;