From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 28 Apr 2010 21:23:15 +0000 (-0700)
Subject: wireless: Fix merge.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=28b4c3bf1c4aa306fc5189fc7d556aa780c68e98;p=linux-beck.git

wireless: Fix merge.

in your merge in 5c01d5669356e13f0fb468944c1dd4c6a7e978ad 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>
---

diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 814f300c3f17..e47a58d2cc19 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -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;