tree fcffdab76710a231579fd927203cb0f50ced7657
parent 13f09b95a82c46ed608d057b22e0dd18ebfff22a
author John W. Linville <linville@tuxdriver.com> 1201198081 -0500
committer David S. Miller <davem@davemloft.net> 1201836393 -0800

rt61pci: fix-up merge damage

A subtle merge error was introduced after re-queueing a patch for 2.6.24
instead of 2.6.25...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>