Commit 28b4c3bf authored Apr 28, 2010 by Hauke Mehrtens Committed by David S. Miller Apr 28, 2010

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: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2c485209

drivers/net/wireless/wl12xx/wl1271_main.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1311,7 +1311,6 @@ static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw,
		struct wl1271_filter_params *fp;
		struct netdev_hw_addr *ha;
		struct wl1271 *wl = hw->priv;
		int i;

		if (unlikely(wl->state == WL1271_STATE_OFF))
		return 0;