Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index e2150b3c83d9..f92fe86fdcae 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -152,13 +152,13 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
 
         tp->tmspriv = cardinfo;
 
+        dev->netdev_ops = &tms380tr_netdev_ops;
+
         ret = request_irq(pdev->irq, tms380tr_interrupt, IRQF_SHARED,
                           dev->name, dev);
         if (ret)
                 goto err_out_tmsdev;
 
-        dev->open = tms380tr_open;
-        dev->stop = tms380tr_close;
         pci_set_drvdata(pdev, dev);
         SET_NETDEV_DEV(dev, &pdev->dev);