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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index 078e5f4520ef..be7b4e56154f 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -720,6 +720,7 @@ static const struct file_operations envctrl_fops = {
 #endif
         .open =                 envctrl_open,
         .release =              envctrl_release,
+        .llseek =               noop_llseek,
 };      
 
 static struct miscdevice envctrl_dev = {
@@ -1027,8 +1028,7 @@ static int kenvctrld(void *__unused)
         return 0;
 }
 
-static int __devinit envctrl_probe(struct platform_device *op,
-                                   const struct of_device_id *match)
+static int __devinit envctrl_probe(struct platform_device *op)
 {
         struct device_node *dp;
         int index, err;
@@ -1128,7 +1128,7 @@ static const struct of_device_id envctrl_match[] = {
 };
 MODULE_DEVICE_TABLE(of, envctrl_match);
 
-static struct of_platform_driver envctrl_driver = {
+static struct platform_driver envctrl_driver = {
         .driver = {
                 .name = DRIVER_NAME,
                 .owner = THIS_MODULE,
@@ -1140,12 +1140,12 @@ static struct of_platform_driver envctrl_driver = {
 
 static int __init envctrl_init(void)
 {
-        return of_register_platform_driver(&envctrl_driver);
+        return platform_driver_register(&envctrl_driver);
 }
 
 static void __exit envctrl_exit(void)
 {
-        of_unregister_platform_driver(&envctrl_driver);
+        platform_driver_unregister(&envctrl_driver);
 }
 
 module_init(envctrl_init);