diff --git a/[refs] b/[refs]
index 6080a5c2ca8d..4f680a37c0b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09a4847085cb9c1a687940d12cc2b61d86099ad1
+refs/heads/master: b5c60b5fdbb3e27fa70f182bba98cdbca02f5c3f
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 7e9ed523b48b..8144587c7664 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -346,17 +346,6 @@ wl_ops_bss_info_changed(struct ieee80211_hw *hw,
 			  __func__, info->assoc ? "" : "dis");
 		wlc_associate_upd(wl->wlc, info->assoc);
 	}
-	if (changed & BSS_CHANGED_ERP_CTS_PROT) {
-		/* CTS protection changed */
-		wiphy_err(wiphy, "%s: use_cts_prot: %s (implement)\n", __func__,
-			  info->use_cts_prot ? "true" : "false");
-	}
-	if (changed & BSS_CHANGED_ERP_PREAMBLE) {
-		/* preamble changed */
-		wiphy_err(wiphy, "%s: short preamble: %s (implement)\n",
-			  __func__, info->use_short_preamble ? "true" :
-			  "false");
-	}
 	if (changed & BSS_CHANGED_ERP_SLOT) {
 		/* slot timing changed */
 		if (info->use_short_slot)