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

This commit is contained in:
David S. Miller
2012-04-13 13:32:07 -07:00
10887 changed files with 514668 additions and 299514 deletions

View File

@@ -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);