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

[firefly-linux-kernel-4.4.55.git] / drivers / sbus / char / flash.c

diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index ed9494e1885995568c478e28fdbc50e9cb6c71b4..8bb31c584b64f4bd2dd82a365ebe882cf4404bee 100644 (file)
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -219,12 +219,12 @@ static struct of_platform_driver flash_driver = {
 
 static int __init flash_init(void)
 {
-       return of_register_driver(&flash_driver, &of_bus_type);
+       return of_register_platform_driver(&flash_driver);
 }
 
 static void __exit flash_cleanup(void)
 {
-       of_unregister_driver(&flash_driver);
+       of_unregister_platform_driver(&flash_driver);
 }
 
 module_init(flash_init);