Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user