Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 617f898ba5f0..53aeea4b536e 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -735,7 +735,7 @@ static int myri_header(struct sk_buff *skb, struct net_device *dev,
                 int i;
                 for (i = 0; i < dev->addr_len; i++)
                         eth->h_dest[i] = 0;
-                return(dev->hard_header_len);
+                return dev->hard_header_len;
         }
 
         if (daddr) {
@@ -926,7 +926,7 @@ static const struct net_device_ops myri_ops = {
         .ndo_validate_addr      = eth_validate_addr,
 };
 
-static int __devinit myri_sbus_probe(struct platform_device *op, const struct of_device_id *match)
+static int __devinit myri_sbus_probe(struct platform_device *op)
 {
         struct device_node *dp = op->dev.of_node;
         static unsigned version_printed;
@@ -1009,7 +1009,7 @@ static int __devinit myri_sbus_probe(struct platform_device *op, const struct of
 
         /* Map in the MyriCOM register/localram set. */
         if (mp->eeprom.cpuvers < CPUVERS_4_0) {
-                /* XXX Makes no sense, if control reg is non-existant this
+                /* XXX Makes no sense, if control reg is non-existent this
                  * XXX driver cannot function at all... maybe pre-4.0 is
                  * XXX only a valid version for PCI cards?  Ask feldy...
                  */
@@ -1160,7 +1160,7 @@ static const struct of_device_id myri_sbus_match[] = {
 
 MODULE_DEVICE_TABLE(of, myri_sbus_match);
 
-static struct of_platform_driver myri_sbus_driver = {
+static struct platform_driver myri_sbus_driver = {
         .driver = {
                 .name = "myri",
                 .owner = THIS_MODULE,
@@ -1172,12 +1172,12 @@ static struct of_platform_driver myri_sbus_driver = {
 
 static int __init myri_sbus_init(void)
 {
-        return of_register_platform_driver(&myri_sbus_driver);
+        return platform_driver_register(&myri_sbus_driver);
 }
 
 static void __exit myri_sbus_exit(void)
 {
-        of_unregister_platform_driver(&myri_sbus_driver);
+        platform_driver_unregister(&myri_sbus_driver);
 }
 
 module_init(myri_sbus_init);