Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / arcnet / com90io.c

diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c
index 1f03027354167cd29ba1c82467192f4d6892eecb..89de29b3b1dc0d09628b093fb6ac34483984716e 100644 (file)
--- a/drivers/net/arcnet/com90io.c
+++ b/drivers/net/arcnet/com90io.c
@@ -248,7 +248,7 @@ static int __init com90io_found(struct net_device *dev)
                return -EBUSY;
        }
 
-       lp = dev->priv;
+       lp = netdev_priv(dev);
        lp->card_name = "COM90xx I/O";
        lp->hw.command = com90io_command;
        lp->hw.status = com90io_status;
@@ -290,7 +290,7 @@ static int __init com90io_found(struct net_device *dev)
  */
 static int com90io_reset(struct net_device *dev, int really_reset)
 {
-       struct arcnet_local *lp = dev->priv;
+       struct arcnet_local *lp = netdev_priv(dev);
        short ioaddr = dev->base_addr;
 
        BUGMSG(D_INIT, "Resetting %s (status=%02Xh)\n", dev->name, ASTATUS());
@@ -398,8 +398,6 @@ static int __init com90io_init(void)
        if (!dev)
                return -ENOMEM;
 
-       SET_MODULE_OWNER(dev);
-
        dev->base_addr = io;
        dev->irq = irq;
        if (dev->irq == 2)