Skip to content
Commit 28b4c3bf authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by David S. Miller
Browse files

wireless: Fix merge.

in your merge in 5c01d566

 you added "int
i;" into wl1271_main.c which is unused in that function.

This patch fixes the merge problem:

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c485209
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment