aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2008-01-24 13:08:01 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-31 22:26:33 -0500
commit4bdb0fba9e53dc263eb9601404d097dd99e60f83 (patch)
treefcffdab76710a231579fd927203cb0f50ced7657
parent13f09b95a82c46ed608d057b22e0dd18ebfff22a (diff)
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>
-rw-r--r--drivers/net/wireless/rt2x00/rt61pci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index ab52f221cd71..b31f0c26c32b 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1736,7 +1736,8 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
1736 WARNING(rt2x00dev, 1736 WARNING(rt2x00dev,
1737 "TX status report missed for entry %p\n", 1737 "TX status report missed for entry %p\n",
1738 entry_done); 1738 entry_done);
1739 rt2x00lib_txdone(entry_done, TX_FAIL_OTHER, 0); 1739 rt2x00pci_txdone(rt2x00dev, entry_done, TX_FAIL_OTHER,
1740 0);
1740 entry_done = rt2x00_get_data_entry_done(ring); 1741 entry_done = rt2x00_get_data_entry_done(ring);
1741 } 1742 }
1742 1743