diff --git a/[refs] b/[refs]
index ac3571c5e62c..99761c93680c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1139df53533e8a4327f3867c6b32202ac62b19ee
+refs/heads/master: 88b3eaa499ddbe5a36c34840117563bd54ec4ec2
diff --git a/trunk/drivers/staging/brcm80211/util/bcmwifi.c b/trunk/drivers/staging/brcm80211/util/bcmwifi.c
index c51fea048a42..37c26af42a9d 100644
--- a/trunk/drivers/staging/brcm80211/util/bcmwifi.c
+++ b/trunk/drivers/staging/brcm80211/util/bcmwifi.c
@@ -176,22 +176,6 @@ int wf_mhz2channel(uint freq, uint start_factor)
  *
  * Reference 802.11 REVma, section 17.3.8.3, and 802.11B section 18.4.6.2
  */
-#ifdef BRCM_FULLMAC
-int wf_channel2mhz(uint ch, uint start_factor)
-{
-	int freq;
-
-	if ((start_factor == WF_CHAN_FACTOR_2_4_G && (ch < 1 || ch > 14)) ||
-	(ch <= 200))
-		freq = -1;
-	if ((start_factor == WF_CHAN_FACTOR_2_4_G) && (ch == 14))
-		freq = 2484;
-	else
-		freq = ch * 5 + start_factor / 2;
-
-	return freq;
-}
-#else /* !BRCM_FULLMAC */
 int wf_channel2mhz(uint ch, uint start_factor)
 {
 	int freq;
@@ -206,4 +190,3 @@ int wf_channel2mhz(uint ch, uint start_factor)
 
 	return freq;
 }
-#endif /* BRCM_FULLMAC */