Pull acpi-debug into release branch

[linux-2.6-omap-h63xx.git] / drivers / net / arm / am79c961a.c

diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index ddd12d44ff22dab8d7ab7b3ec44e323311af46a7..2143eeb7a2b0fdf34143d8c14bfe0a623a5c7894 100644 (file)
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -526,7 +526,6 @@ am79c961_rx(struct net_device *dev, struct dev_priv *priv)
                skb = dev_alloc_skb(len + 2);
 
                if (skb) {
-                       skb->dev = dev;
                        skb_reserve(skb, 2);
 
                        am_readbuffer(dev, pktaddr, skb_put(skb, len), len);
@@ -635,7 +634,7 @@ static void am79c961_poll_controller(struct net_device *dev)
 {
        unsigned long flags;
        local_irq_save(flags);
-       am79c961_interrupt(dev->irq, dev, NULL);
+       am79c961_interrupt(dev->irq, dev);
        local_irq_restore(flags);
 }
 #endif