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

1 files changed, 2 insertions, 5 deletions

diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index e65b9fc52b49..f09257c86107 100644
--- 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);