vserver 1.9.5.x5

[linux-2.6.git] / drivers / net / ibmlana.c

diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index a0eaa80..79c3fbf 100644 (file)
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -88,9 +88,9 @@ History:
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/processor.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #define _IBM_LANA_DRIVER_
@@ -98,6 +98,8 @@ History:
 
 #undef DEBUG
 
+#define DRV_NAME "ibmlana"
+
 /* ------------------------------------------------------------------------
  * global static data - not more since we can handle multiple boards and
  * have to pack all state info into the device struct!
@@ -883,14 +885,6 @@ static struct net_device_stats *ibmlana_stats(struct net_device *dev)
        return &priv->stat;
 }
 
-/* we don't support runtime reconfiguration, since am MCA card can
-   be unambigously identified by its POS registers. */
-
-static int ibmlana_config(struct net_device *dev, struct ifmap *map)
-{
-       return 0;
-}
-
 /* switch receiver mode. */
 
 static void ibmlana_set_multicast_list(struct net_device *dev)
@@ -952,8 +946,8 @@ static int ibmlana_probe(struct net_device *dev)
        printk(KERN_INFO "%s: IBM LAN Adapter/A found in slot %d\n", dev->name, slot + 1);
 
        /* try to obtain I/O range */
-       if (!request_region(iobase, IBM_LANA_IORANGE, dev->name)) {
-               printk(KERN_ERR "%s: cannot allocate I/O range at %#x!\n", dev->name, iobase);
+       if (!request_region(iobase, IBM_LANA_IORANGE, DRV_NAME)) {
+               printk(KERN_ERR "%s: cannot allocate I/O range at %#x!\n", DRV_NAME, iobase);
                startslot = slot + 1;
                return -EBUSY;
        }
@@ -982,7 +976,6 @@ static int ibmlana_probe(struct net_device *dev)
 
        dev->open = ibmlana_open;
        dev->stop = ibmlana_close;
-       dev->set_config = ibmlana_config;
        dev->hard_start_xmit = ibmlana_tx;
        dev->do_ioctl = NULL;
        dev->get_stats = ibmlana_stats;
@@ -1027,8 +1020,8 @@ static struct net_device *moddevs[DEVMAX];
 static int irq;
 static int io;
 
-MODULE_PARM(irq, "i");
-MODULE_PARM(io, "i");
+module_param(irq, int, 0);
+module_param(io, int, 0);
 MODULE_PARM_DESC(irq, "IBM LAN/A IRQ number");
 MODULE_PARM_DESC(io, "IBM LAN/A I/O base address");
 MODULE_LICENSE("GPL");