The patch titled
     Fix compilation problem with spider network driver on 2.6.20-rc6-mm2
has been added to the -mm tree.  Its filename is
     spider-fix-gregkh-driver-network-device.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: Fix compilation problem with spider network driver on 2.6.20-rc6-mm2
From: Bernhard Walle <[EMAIL PROTECTED]>

Fixes compilation with 2.6.20-rc6-mm1.

Signed-off-by: Bernhard Walle <[EMAIL PROTECTED]>
Cc: Utz Bacher <[EMAIL PROTECTED]>
Cc: Jens Osterkamp <[EMAIL PROTECTED]>
Cc: Greg KH <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 drivers/net/spider_net.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN drivers/net/spider_net.c~spider-fix-gregkh-driver-network-device 
drivers/net/spider_net.c
--- a/drivers/net/spider_net.c~spider-fix-gregkh-driver-network-device
+++ a/drivers/net/spider_net.c
@@ -1906,8 +1906,7 @@ spider_net_stop(struct net_device *netde
        spider_net_write_reg(card, SPIDER_NET_GHIINT1MSK, 0);
        spider_net_write_reg(card, SPIDER_NET_GHIINT2MSK, 0);
 
-       /* free_irq(netdev->irq, netdev);*/
-       free_irq(to_pci_dev(netdev->class_dev.dev)->irq, netdev);
+       free_irq(card->pdev->irq, netdev);
 
        spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR,
                             SPIDER_NET_DMA_TX_FEND_VALUE);
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

spider-fix-gregkh-driver-network-device.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to