wireless: Fix merge.

Browse source

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

...

This commit is contained in:

Hauke Mehrtens 2010-04-28 14:23:15 -07:00 • committed by David S. Miller

parent 2c485209a5

commit 28b4c3bf1c

1 changed files with 0 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/net/wireless/wl12xx/wl1271_main.c

View file