[PATCH] PCI: MSI(X) save/restore for suspend/resume

[safe/jmp/linux-2.6] / drivers / net / ixp2000 / ixpdev.c

diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c
index 0f7b8ab..fbc2d21 100644 (file)
--- a/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
@@ -16,7 +16,7 @@
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/moduleparam.h>
-#include <asm/arch/uengine.h>
+#include <asm/hardware/uengine.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include "ixp2400_rx.ucode"
@@ -24,6 +24,8 @@
 #include "ixpdev_priv.h"
 #include "ixpdev.h"
 
+#define DRV_MODULE_VERSION     "0.2"
+
 static int nds_count;
 static struct net_device **nds;
 static int nds_open;
@@ -200,7 +202,7 @@ static irqreturn_t ixpdev_interrupt(int irq, void *dev_id, struct pt_regs *regs)
         */
        if (status & 0x00ff) {
                ixp2000_reg_wrb(IXP2000_IRQ_THD_ENABLE_CLEAR_A_0, 0x00ff);
-               if (likely(netif_rx_schedule_test(nds[0]))) {
+               if (likely(__netif_rx_schedule_prep(nds[0]))) {
                        __netif_rx_schedule(nds[0]);
                } else {
                        printk(KERN_CRIT "ixp2000: irq while polling!!\n");
@@ -297,10 +299,9 @@ int ixpdev_init(int __nds_count, struct net_device **__nds,
        int i;
        int err;
 
-       if (RX_BUF_COUNT > 192 || TX_BUF_COUNT > 192) {
-               static void __too_many_rx_or_tx_buffers(void);
-               __too_many_rx_or_tx_buffers();
-       }
+       BUILD_BUG_ON(RX_BUF_COUNT > 192 || TX_BUF_COUNT > 192);
+
+       printk(KERN_INFO "IXP2000 MSF ethernet driver %s\n", DRV_MODULE_VERSION);
 
        nds_count = __nds_count;
        nds = __nds;