From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 10 Jun 2008 13:06:52 +0000 (-0400)
Subject: rt2x00dev.c: fix-up merge damage
X-Git-Tag: v2.6.27-rc1~969^2~335
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb14cb791c57b45ba32c92b041420cdc1b1a0283;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed