diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-08-12 14:45:06 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-08-12 14:45:06 -0400 |
commit | 89c2af3c14ddf8ae48637a7b454d66ac5e0ca728 (patch) | |
tree | 77faf3fc889fb0e77ce7c4778f2bbc93fdf8cdd2 /drivers/net/wireless/iwlegacy/common.c | |
parent | f3dfd20860db3d0c400dd83a378176a28d3662db (diff) | |
parent | d1e2586f484dfc36eee2b2d3a6c6c77be67ca492 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/ethernet/broadcom/Kconfig
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index 3195aad440d..b03e22ef546 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c @@ -4660,6 +4660,7 @@ il_force_reset(struct il_priv *il, bool external) return 0; } +EXPORT_SYMBOL(il_force_reset); int il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, |