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

[net-next-2.6.git] / drivers / crypto / n2_core.c

diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
index b99c38f23d6137337a7c4f49270a31fd9fa1de36..26af2dd5d8316e73cf95f966aa215ae7ebb1dd37 100644 (file)
--- a/drivers/crypto/n2_core.c
+++ b/drivers/crypto/n2_core.c
@@ -2247,20 +2247,20 @@ static struct of_platform_driver n2_mau_driver = {
 
 static int __init n2_init(void)
 {
-       int err = of_register_driver(&n2_crypto_driver, &of_bus_type);
+       int err = of_register_platform_driver(&n2_crypto_driver);
 
        if (!err) {
-               err = of_register_driver(&n2_mau_driver, &of_bus_type);
+               err = of_register_platform_driver(&n2_mau_driver);
                if (err)
-                       of_unregister_driver(&n2_crypto_driver);
+                       of_unregister_platform_driver(&n2_crypto_driver);
        }
        return err;
 }
 
 static void __exit n2_exit(void)
 {
-       of_unregister_driver(&n2_mau_driver);
-       of_unregister_driver(&n2_crypto_driver);
+       of_unregister_platform_driver(&n2_mau_driver);
+       of_unregister_platform_driver(&n2_crypto_driver);
 }
 
 module_init(n2_init);