Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/net/wimax/i2400m/usb-notif.c

2 files changed, 14 insertions, 14 deletions

diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c
index 4e7a5faf0351..664835b822fb 100644
--- a/drivers/net/mipsnet.c
+++ b/drivers/net/mipsnet.c
@@ -237,7 +237,7 @@ static void mipsnet_set_mclist(struct net_device *dev)
 {
 }
 
-static int __init mipsnet_probe(struct device *dev)
+static int __init mipsnet_probe(struct platform_device *dev)
 {
         struct net_device *netdev;
         int err;
@@ -248,7 +248,7 @@ static int __init mipsnet_probe(struct device *dev)
                 goto out;
         }
 
-        dev_set_drvdata(dev, netdev);
+        platform_set_drvdata(dev, netdev);
 
         netdev->open                    = mipsnet_open;
         netdev->stop                    = mipsnet_close;
@@ -293,23 +293,25 @@ out:
         return err;
 }
 
-static int __devexit mipsnet_device_remove(struct device *device)
+static int __devexit mipsnet_device_remove(struct platform_device *device)
 {
-        struct net_device *dev = dev_get_drvdata(device);
+        struct net_device *dev = platform_get_drvdata(device);
 
         unregister_netdev(dev);
         release_region(dev->base_addr, sizeof(struct mipsnet_regs));
         free_netdev(dev);
-        dev_set_drvdata(device, NULL);
+        platform_set_drvdata(device, NULL);
 
         return 0;
 }
 
-static struct device_driver mipsnet_driver = {
-        .name   = mipsnet_string,
-        .bus    = &platform_bus_type,
-        .probe  = mipsnet_probe,
-        .remove = __devexit_p(mipsnet_device_remove),
+static struct platform_driver mipsnet_driver = {
+        .driver = {
+                .name           = mipsnet_string,
+                .owner          = THIS_MODULE,
+        },
+        .probe          = mipsnet_probe,
+        .remove         = __devexit_p(mipsnet_device_remove),
 };
 
 static int __init mipsnet_init_module(void)
@@ -319,7 +321,7 @@ static int __init mipsnet_init_module(void)
         printk(KERN_INFO "MIPSNet Ethernet driver. Version: %s. "
                "(c)2005 MIPS Technologies, Inc.\n", MIPSNET_VERSION);
 
-        err = driver_register(&mipsnet_driver);
+        err = platform_driver_register(&mipsnet_driver);
         if (err)
                 printk(KERN_ERR "Driver registration failed\n");
 
@@ -328,7 +330,7 @@ static int __init mipsnet_init_module(void)
 
 static void __exit mipsnet_exit_module(void)
 {
-        driver_unregister(&mipsnet_driver);
+        platform_driver_unregister(&mipsnet_driver);
 }
 
 module_init(mipsnet_init_module);
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index d4fb4acdbebd..4e9bd380a5c2 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2649,8 +2649,6 @@ static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
         int err = -ENODEV;
 
         sbus_dp = to_of_device(op->dev.parent)->node;
-        if (is_qfe)
-                sbus_dp = to_of_device(op->dev.parent->parent)->node;
 
         /* We can match PCI devices too, do not accept those here. */
         if (strcmp(sbus_dp->name, "sbus"))