diff --git a/[refs] b/[refs]
index 1a9b52c40cb9..ddcec416579a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 901937707229abf86d2b976d30bb2285056fce8a
+refs/heads/master: a68ec4892aa9a88e6a0de51a741a6bc902964a8b
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
index d02364be8614..f9fc644ec025 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
@@ -43,7 +43,7 @@ static struct wlc_pub *wlc_pub_malloc(uint unit,
 static void wlc_pub_mfree(struct wlc_pub *pub);
 static void wlc_tunables_init(wlc_tunables_t *tunables, uint devid);
 
-void wlc_tunables_init(wlc_tunables_t *tunables, uint devid)
+static void wlc_tunables_init(wlc_tunables_t *tunables, uint devid)
 {
 	tunables->ntxd = NTXD;
 	tunables->nrxd = NRXD;
@@ -137,7 +137,7 @@ static void wlc_bsscfg_mfree(struct wlc_bsscfg *cfg)
 	kfree(cfg);
 }
 
-void wlc_bsscfg_ID_assign(struct wlc_info *wlc, struct wlc_bsscfg *bsscfg)
+static void wlc_bsscfg_ID_assign(struct wlc_info *wlc, struct wlc_bsscfg *bsscfg)
 {
 	bsscfg->ID = wlc->next_bsscfg_ID;
 	wlc->next_bsscfg_ID++;
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
index bbcff4fb5147..2572541bde9b 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
@@ -122,9 +122,6 @@ struct wlc_bsscfg {
 #define HWBCN_ENAB(cfg)		(((cfg)->flags & WLC_BSSCFG_HW_BCN) != 0)
 #define HWPRB_ENAB(cfg)		(((cfg)->flags & WLC_BSSCFG_HW_PRB) != 0)
 
-extern void wlc_bsscfg_ID_assign(struct wlc_info *wlc,
-				 struct wlc_bsscfg *bsscfg);
-
 /* Extend N_ENAB to per-BSS */
 #define BSS_N_ENAB(wlc, cfg) \
 	(N_ENAB((wlc)->pub) && !((cfg)->flags & WLC_BSSCFG_11N_DISABLE))