Merge branch 'for-2.6.23' into merge

[linux-2.6-omap-h63xx.git] / drivers / net / 3c527.c

diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index d516c3225ca469aea45e95e6e4e53ad38a62130d..c7b571be20e0693a7ba1dadc4f60da2b305bdbff 100644 (file)
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -1189,7 +1189,6 @@ static void mc32_rx_ring(struct net_device *dev)
                        }
 
                        skb->protocol=eth_type_trans(skb,dev);
-                       skb->dev=dev;
                        dev->last_rx = jiffies;
                        lp->net_stats.rx_packets++;
                        lp->net_stats.rx_bytes += length;
@@ -1324,11 +1323,6 @@ static irqreturn_t mc32_interrupt(int irq, void *dev_id)
        int rx_event = 0;
        int tx_event = 0;
 
-       if (dev == NULL) {
-               printk(KERN_WARNING "%s: irq %d for unknown device.\n", cardname, irq);
-               return IRQ_NONE;
-       }
-
        ioaddr = dev->base_addr;
        lp = netdev_priv(dev);
 
@@ -1664,7 +1658,7 @@ int __init init_module(void)
  *     transmit operations are allowed to start scribbling into memory.
  */
 
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        unregister_netdev(this_device);
        cleanup_card(this_device);