Merge branch 'linus' into percpu-cpumask-x86-for-linus-2

Conflicts:
	arch/sparc/kernel/time_64.c
	drivers/gpu/drm/drm_proc.c

Manual merge to resolve build warning due to phys_addr_t type change
on x86:

	drivers/gpu/drm/drm_info.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
index c0f58f08782c..46db5c5395b2 100644
--- a/drivers/net/tokenring/skisa.c
+++ b/drivers/net/tokenring/skisa.c
@@ -133,6 +133,8 @@ static int __init sk_isa_probe1(struct net_device *dev, int ioaddr)
         return 0;
 }
 
+static struct net_device_ops sk_isa_netdev_ops __read_mostly;
+
 static int __init setup_card(struct net_device *dev, struct device *pdev)
 {
         struct net_local *tp;
@@ -184,8 +186,7 @@ static int __init setup_card(struct net_device *dev, struct device *pdev)
 
         tp->tmspriv = NULL;
 
-        dev->open = sk_isa_open;
-        dev->stop = tms380tr_close;
+        dev->netdev_ops = &sk_isa_netdev_ops;
 
         if (dev->irq == 0)
         {
@@ -362,6 +363,10 @@ static int __init sk_isa_init(void)
         struct platform_device *pdev;
         int i, num = 0, err = 0;
 
+        sk_isa_netdev_ops = tms380tr_netdev_ops;
+        sk_isa_netdev_ops.ndo_open = sk_isa_open;
+        sk_isa_netdev_ops.ndo_stop = tms380tr_close;
+
         err = platform_driver_register(&sk_isa_driver);
         if (err)
                 return err;