diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-12-11 16:24:55 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-12-11 16:24:55 -0500 |
commit | f9c4d420c12de65e58a1a14ccee03e8b5cf99f5b (patch) | |
tree | 7cfaf7e15f29c30919b1d4527862ce914619cbe2 /drivers/net/wireless/brcm80211/brcmfmac/dhd.h | |
parent | 75be437230b06fca87908a787f70de0ce7fbab8c (diff) | |
parent | c66cfd5325bb215a251f4685fac8718b1da33197 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd.h')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h index 24bc4e3e162b..fd672bf53867 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h @@ -470,7 +470,6 @@ struct brcmf_pub { struct brcmf_bus *bus_if; struct brcmf_proto *prot; struct brcmf_cfg80211_info *config; - struct device *dev; /* fullmac dongle device pointer */ /* Internal brcmf items */ uint hdrlen; /* Total BRCMF header length (proto + bus) */ |