Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[karo-tx-linux.git] / drivers / net / sunhme.c

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 0a63ebef86a00a5ade1c2d66e25254b22f499ce5..eec443f640790ccde8def34cfd06bd6cf77a6700 100644 (file)
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -3304,7 +3304,7 @@ static int __init happy_meal_sbus_init(void)
 {
        int err;
 
-       err = of_register_driver(&hme_sbus_driver, &of_bus_type);
+       err = of_register_platform_driver(&hme_sbus_driver);
        if (!err)
                err = quattro_sbus_register_irqs();
 
@@ -3313,7 +3313,7 @@ static int __init happy_meal_sbus_init(void)
 
 static void happy_meal_sbus_exit(void)
 {
-       of_unregister_driver(&hme_sbus_driver);
+       of_unregister_platform_driver(&hme_sbus_driver);
        quattro_sbus_free_irqs();
 
        while (qfe_sbus_list) {