Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / drivers / net / arm / ep93xx_eth.c

diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c
index 7f016f3d5bf0ea3cd4f7675d50e0dd1c24d8f5f9..91a6590d107b181177a74e0bcd71003e9c4a906c 100644 (file)
--- a/drivers/net/arm/ep93xx_eth.c
+++ b/drivers/net/arm/ep93xx_eth.c
@@ -417,7 +417,7 @@ static irqreturn_t ep93xx_irq(int irq, void *dev_id)
 
        if (status & REG_INTSTS_RX) {
                spin_lock(&ep->rx_lock);
-               if (likely(__netif_rx_schedule_prep(dev, &ep->napi))) {
+               if (likely(netif_rx_schedule_prep(dev, &ep->napi))) {
                        wrl(ep, REG_INTEN, REG_INTEN_TX);
                        __netif_rx_schedule(dev, &ep->napi);
                }