Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[firefly-linux-kernel-4.4.55.git] / arch / sparc / kernel / ds.c

diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index e65b9fc52b49b7d653992b2eece6ab81a25d87ea..f09257c86107c0c64cf58076a9204d1d79bb697c 100644 (file)
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -1244,10 +1244,7 @@ static struct vio_driver ds_driver = {
        .id_table       = ds_match,
        .probe          = ds_probe,
        .remove         = ds_remove,
-       .driver         = {
-               .name   = "ds",
-               .owner  = THIS_MODULE,
-       }
+       .name           = "ds",
 };
 
 static int __init ds_init(void)
@@ -1267,4 +1264,4 @@ static int __init ds_init(void)
        return vio_register_driver(&ds_driver);
 }
 
-subsys_initcall(ds_init);
+fs_initcall(ds_init);