Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus

[~andy/linux] / drivers / video / ffb.c

diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 95c0227f47fcfd7fd30ea784b4202af1dace340a..f6ecfab296d39515f3639c3af2f618aa9a702f63 100644 (file)
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -1067,12 +1067,12 @@ static int __init ffb_init(void)
        if (fb_get_options("ffb", NULL))
                return -ENODEV;
 
-       return of_register_driver(&ffb_driver, &of_bus_type);
+       return of_register_platform_driver(&ffb_driver);
 }
 
 static void __exit ffb_exit(void)
 {
-       of_unregister_driver(&ffb_driver);
+       of_unregister_platform_driver(&ffb_driver);
 }
 
 module_init(ffb_init);