From 7afb627825e78f428a5f33aa3d4dc0219b27245e Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@kernel.org>
Date: Sun, 28 Nov 2010 23:00:04 +0200
Subject: [PATCH] --- yaml --- r: 228234 b: refs/heads/master c:
 37b0544a4a455609cbf25fa56441a6f1221dec85 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/winbond/mlmetxrx_f.h | 4 ----
 trunk/drivers/staging/winbond/reg.c        | 4 ----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index dfdf7d32d479..8aae358babc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9618386a4e58e0459932846d9b07fa81225840d3
+refs/heads/master: 37b0544a4a455609cbf25fa56441a6f1221dec85
diff --git a/trunk/drivers/staging/winbond/mlmetxrx_f.h b/trunk/drivers/staging/winbond/mlmetxrx_f.h
index 012507fc49e3..6db423bc6677 100644
--- a/trunk/drivers/staging/winbond/mlmetxrx_f.h
+++ b/trunk/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/trunk/drivers/staging/winbond/reg.c b/trunk/drivers/staging/winbond/reg.c
index 4d2c6a12a951..1b38d6d225c9 100644
--- a/trunk/drivers/staging/winbond/reg.c
+++ b/trunk/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;