diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-18 14:17:13 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-18 14:27:48 -0400 |
| commit | 59ef43e681d103a51c3727dad0315e093f07ec61 (patch) | |
| tree | 87f6320f1440ce3ce6c0c15ad3cef8bc98186f88 /drivers/net/wireless/brcm80211/brcmfmac/dhd.h | |
| parent | 91fbe33034c184c6a60e31c2207a2f7ec2f180dc (diff) | |
| parent | b5abcf0219263f4e961dca71cbe26e06c5b0ee68 (diff) | |
| download | talos-op-linux-59ef43e681d103a51c3727dad0315e093f07ec61.tar.gz talos-op-linux-59ef43e681d103a51c3727dad0315e093f07ec61.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
include/net/nfc/nfc.h
net/nfc/netlink.c
net/wireless/nl80211.c
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 07686a748d3c..9f637014486e 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h @@ -632,7 +632,6 @@ extern const struct bcmevent_name bcmevent_names[]; extern uint brcmf_c_mkiovar(char *name, char *data, uint datalen, char *buf, uint len); -extern int brcmf_net_attach(struct brcmf_pub *drvr, int idx); extern int brcmf_netdev_wait_pend8021x(struct net_device *ndev); extern s32 brcmf_exec_dcmd(struct net_device *dev, u32 cmd, void *arg, u32 len); |
