diff --git a/[refs] b/[refs]
index 24fab8eea621..61333b37f125 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9a6073c51ddc4f562b1918ded7e27830e0d9d9f
+refs/heads/master: edae01b94a846b39664420fe0c7561a594bb50a2
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 7bdd60efa544..badc33d83660 100644
--- a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -143,14 +143,6 @@ uint wl_msg_level =
 static wlc_info_t *wlc_info_dbg = (wlc_info_t *) (NULL);
 #endif
 
-#if defined(BCMDBG)
-struct wlc_id_name_entry {
-	int id;
-	const char *name;
-};
-typedef struct wlc_id_name_entry wlc_id_name_table_t[];
-#endif
-
 /* IOVar table */
 
 /* Parameter IDs, for use only internally to wlc -- in the wlc_iovars