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/4965-rs.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/4965-rs.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-rs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c index ed3c42a63a4..3ccbaf791b4 100644 --- a/drivers/net/wireless/iwlegacy/4965-rs.c +++ b/drivers/net/wireless/iwlegacy/4965-rs.c @@ -2803,6 +2803,7 @@ il4965_rs_remove_debugfs(void *il, void *il_sta) */ static void il4965_rs_rate_init_stub(void *il_r, struct ieee80211_supported_band *sband, + struct cfg80211_chan_def *chandef, struct ieee80211_sta *sta, void *il_sta) { } |