diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-04-28 14:23:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-28 14:23:15 -0700 |
| commit | 28b4c3bf1c4aa306fc5189fc7d556aa780c68e98 (patch) | |
| tree | 78b1a6af251f6e85911b59b3b98fa071dcd853ec /drivers/net/igb/igb.h | |
| 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>
Diffstat (limited to 'drivers/net/igb/igb.h')
0 files changed, 0 insertions, 0 deletions