diff --git a/[refs] b/[refs]
index 14b48f5ef88d..2cd621f566d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a980d455baef8194105702c85834a0368172fe0
+refs/heads/master: 1bf8b11069e9fbd3efab45e65e4a6aa2da383b9e
diff --git a/trunk/drivers/staging/brcm80211/include/brcmu_wifi.h b/trunk/drivers/staging/brcm80211/include/brcmu_wifi.h
index 717d88542b72..0ab432d91d2a 100644
--- a/trunk/drivers/staging/brcm80211/include/brcmu_wifi.h
+++ b/trunk/drivers/staging/brcm80211/include/brcmu_wifi.h
@@ -96,18 +96,6 @@
 #define CHSPEC_CHANNEL(chspec)	((u8)((chspec) & WL_CHANSPEC_CHAN_MASK))
 #define CHSPEC_BAND(chspec)	((chspec) & WL_CHANSPEC_BAND_MASK)
 
-#ifdef WL11N_20MHZONLY
-
-#define CHSPEC_CTL_SB(chspec)	WL_CHANSPEC_CTL_SB_NONE
-#define CHSPEC_BW(chspec)	WL_CHANSPEC_BW_20
-#define CHSPEC_IS10(chspec)	0
-#define CHSPEC_IS20(chspec)	1
-#ifndef CHSPEC_IS40
-#define CHSPEC_IS40(chspec)	0
-#endif
-
-#else				/* !WL11N_20MHZONLY */
-
 #define CHSPEC_CTL_SB(chspec)	((chspec) & WL_CHANSPEC_CTL_SB_MASK)
 #define CHSPEC_BW(chspec)	((chspec) & WL_CHANSPEC_BW_MASK)
 
@@ -122,8 +110,6 @@
 	(((chspec) & WL_CHANSPEC_BW_MASK) == WL_CHANSPEC_BW_40)
 #endif
 
-#endif				/* !WL11N_20MHZONLY */
-
 #define CHSPEC_IS5G(chspec) \
 	(((chspec) & WL_CHANSPEC_BAND_MASK) == WL_CHANSPEC_BAND_5G)