Merge branch 'master' into upstream-fixes

[deliverable/linux.git] / drivers / net / jazzsonic.c

diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index e1151d00388e3cb5bc9f408df179a2644b7736ac..272d331d29cd5a6a6363861ca0b1f91cba5ca33a 100644 (file)
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -307,7 +307,7 @@ static int __init jazz_sonic_init_module(void)
        return 0;
 
 out_unregister:
-       driver_unregister(&jazz_sonic_driver);
+       platform_driver_unregister(&jazz_sonic_driver);
 
        return -ENOMEM;
 }