diff --git a/[refs] b/[refs] index faacab33418a..cb5d37dd980a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cd8d7bffbfb9a78df322b1963a13389c737bc0f +refs/heads/master: 3918ec2bed87444d924482bd3b185393a4622183 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pub.h b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pub.h index 4f0fa20b1eaf..a0c170be70ac 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pub.h +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pub.h @@ -319,9 +319,6 @@ struct wlc_pub { u32 boardflags; /* Board specific flags from srom */ u32 boardflags2; /* More board flags if sromrev >= 4 */ bool tempsense_disable; /* disable periodic tempsense check */ - - bool _lmac; /* lmac module included and enabled */ - bool _lmacproto; /* lmac protocol module included and enabled */ bool phy_11ncapable; /* the PHY/HW is capable of 802.11N */ bool _ampdumac; /* mac assist ampdu enabled or not */