Commit 28b4c3bf authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by David S. Miller

wireless: Fix merge.

in your merge in 5c01d566 you added "int
i;" into wl1271_main.c which is unused in that function.

This patch fixes the merge problem:
Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c485209
...@@ -1311,7 +1311,6 @@ static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw, ...@@ -1311,7 +1311,6 @@ static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw,
struct wl1271_filter_params *fp; struct wl1271_filter_params *fp;
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
struct wl1271 *wl = hw->priv; struct wl1271 *wl = hw->priv;
int i;
if (unlikely(wl->state == WL1271_STATE_OFF)) if (unlikely(wl->state == WL1271_STATE_OFF))
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment