Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[pandora-kernel.git] / drivers / net / tokenring / proteon.c

diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
index b8c955f..16e8783 100644 (file)
--- a/drivers/net/tokenring/proteon.c
+++ b/drivers/net/tokenring/proteon.c
@@ -116,6 +116,8 @@ nodev:
        return -ENODEV;
 }
 
+static struct net_device_ops proteon_netdev_ops __read_mostly;
+
 static int __init setup_card(struct net_device *dev, struct device *pdev)
 {
        struct net_local *tp;
@@ -167,8 +169,7 @@ static int __init setup_card(struct net_device *dev, struct device *pdev)
 
        tp->tmspriv = NULL;
 
-       dev->open = proteon_open;
-       dev->stop = tms380tr_close;
+       dev->netdev_ops = &proteon_netdev_ops;
 
        if (dev->irq == 0)
        {
@@ -352,6 +353,10 @@ static int __init proteon_init(void)
        struct platform_device *pdev;
        int i, num = 0, err = 0;
 
+       proteon_netdev_ops = tms380tr_netdev_ops;
+       proteon_netdev_ops.ndo_open = proteon_open;
+       proteon_netdev_ops.ndo_stop = tms380tr_close;
+
        err = platform_driver_register(&proteon_driver);
        if (err)
                return err;