| commit | 28b4c3bf1c4aa306fc5189fc7d556aa780c68e98 | [log] [tgz] |
|---|---|---|
| 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 [diff] |
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>