commit 28b4c3bf1c4aa306fc5189fc7d556aa780c68e98
author Hauke Mehrtens <hauke@hauke-m.de> Wed Apr 28 14:23:15 2010 -0700
committer David S. Miller <davem@davemloft.net> Wed Apr 28 14:23:15 2010 -0700
tree 78b1a6af251f6e85911b59b3b98fa071dcd853ec
parent 2c485209a5c73fe94f4074e381cdc1ee24ca94a8

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>

drivers/net/wireless/wl12xx/wl1271_main.c

diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 814f300..e47a58d 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1311,7 +1311,6 @@
 	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;