Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

[mv-sheeva.git] / drivers / sbus / char / envctrl.c

diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index bd0bbc621351db63966af1558a1d7bb8ab14bfce..3c27f45e2b6dd281fca4334cd1a11929ac7d7555 100644 (file)
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -1140,12 +1140,12 @@ static struct of_platform_driver envctrl_driver = {
 
 static int __init envctrl_init(void)
 {
-       return of_register_driver(&envctrl_driver, &of_bus_type);
+       return of_register_platform_driver(&envctrl_driver);
 }
 
 static void __exit envctrl_exit(void)
 {
-       of_unregister_driver(&envctrl_driver);
+       of_unregister_platform_driver(&envctrl_driver);
 }
 
 module_init(envctrl_init);