aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/winbond
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2010-11-28 23:00:04 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-01 14:45:46 -0800
commit37b0544a4a455609cbf25fa56441a6f1221dec85 (patch)
tree80a4e4a862a0b2f4e9fe90b361adb3404a475eb6 /drivers/staging/winbond
parent9618386a4e58e0459932846d9b07fa81225840d3 (diff)
downloadlinaro-lsk-37b0544a4a455609cbf25fa56441a6f1221dec85.tar.gz
Staging: w35und: Kill _IBSS_BEACON_SEQ_STICK_
This patch kills the _IBSS_BEACON_SEQ_STICK_ ifdefs because the macro is never defined. Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond')
-rw-r--r--drivers/staging/winbond/mlmetxrx_f.h4
-rw-r--r--drivers/staging/winbond/reg.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/staging/winbond/mlmetxrx_f.h b/drivers/staging/winbond/mlmetxrx_f.h
index 012507fc49e..6db423bc667 100644
--- a/drivers/staging/winbond/mlmetxrx_f.h
+++ b/drivers/staging/winbond/mlmetxrx_f.h
@@ -16,8 +16,4 @@ void
MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID,
unsigned char SendOK);
-#ifdef _IBSS_BEACON_SEQ_STICK_
-s8 SendBCNullData(struct wbsoft_priv *adapter, u16 wIdx);
-#endif
-
#endif
diff --git a/drivers/staging/winbond/reg.c b/drivers/staging/winbond/reg.c
index 4d2c6a12a95..1b38d6d225c 100644
--- a/drivers/staging/winbond/reg.c
+++ b/drivers/staging/winbond/reg.c
@@ -2064,11 +2064,7 @@ void Mxx_initial(struct hw_data *pHwData)
*/
/* M00 bit set */
- #ifdef _IBSS_BEACON_SEQ_STICK_
- reg->M00_MacControl = 0; /* Solve beacon sequence number stop by software */
- #else
reg->M00_MacControl = 0x80000000; /* Solve beacon sequence number stop by hardware */
- #endif
/* M24 disable enter power save, BB RxOn and enable NAV attack */
reg->M24_MacControl = 0x08040042;