]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
rt2x00dev.c: fix-up merge damage
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 10 Jun 2008 13:06:52 +0000 (09:06 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 10 Jun 2008 13:06:52 +0000 (09:06 -0400)
commitcb14cb791c57b45ba32c92b041420cdc1b1a0283
tree89333c407873b5d0a6a6849a94294e952a866bb7
parent65b53e4cc90e59936733b3b95b9451d2ca47528d
rt2x00dev.c: fix-up merge damage

This restores the effects of "rt2x00: Don't count retries as failure".

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rt2x00/rt2x00dev.c