From: John W. Linville Date: Thu, 24 Jan 2008 18:08:01 +0000 (-0500) Subject: rt61pci: fix-up merge damage X-Git-Tag: v2.6.25-rc1~1089^2~172 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4bdb0fba9e53dc263eb9601404d097dd99e60f83;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index ab52f221cd7..b31f0c26c32 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) WARNING(rt2x00dev, "TX status report missed for entry %p\n", entry_done); - rt2x00lib_txdone(entry_done, TX_FAIL_OTHER, 0); + rt2x00pci_txdone(rt2x00dev, entry_done, TX_FAIL_OTHER, + 0); entry_done = rt2x00_get_data_entry_done(ring); }