diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-04-28 23:23:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-28 23:23:15 +0200 |
| commit | 28b4c3bf1c4aa306fc5189fc7d556aa780c68e98 (patch) | |
| tree | 78b1a6af251f6e85911b59b3b98fa071dcd853ec | |
| parent | Bugfix: Link selection was swapped in switch. (diff) | |
| download | linux-28b4c3bf1c4aa306fc5189fc7d556aa780c68e98.tar.xz linux-28b4c3bf1c4aa306fc5189fc7d556aa780c68e98.zip | |
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>
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
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; |