Merge branch 'devel-stable' into devel

[~andy/linux] / drivers / atm / fore200e.c

diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 38df87b198d50bd02e9ea3c03c92d08322d71982..b7385e0777176413c2497b780797e81189888632 100644 (file)
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -2795,7 +2795,7 @@ static int __init fore200e_module_init(void)
        printk(FORE200E "FORE Systems 200E-series ATM driver - version " FORE200E_VERSION "\n");
 
 #ifdef CONFIG_SBUS
-       err = of_register_driver(&fore200e_sba_driver, &of_bus_type);
+       err = of_register_platform_driver(&fore200e_sba_driver);
        if (err)
                return err;
 #endif
@@ -2806,7 +2806,7 @@ static int __init fore200e_module_init(void)
 
 #ifdef CONFIG_SBUS
        if (err)
-               of_unregister_driver(&fore200e_sba_driver);
+               of_unregister_platform_driver(&fore200e_sba_driver);
 #endif
 
        return err;
@@ -2818,7 +2818,7 @@ static void __exit fore200e_module_cleanup(void)
        pci_unregister_driver(&fore200e_pca_driver);
 #endif
 #ifdef CONFIG_SBUS
-       of_unregister_driver(&fore200e_sba_driver);
+       of_unregister_platform_driver(&fore200e_sba_driver);
 #endif
 }