diff options
author | David S. Miller <davem@davemloft.net> | 2012-04-13 22:32:07 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-13 22:32:07 +0200 |
commit | 3423166fdbc2444bf3a4a27af1d7508364a17be7 (patch) | |
tree | 0a42bd5fbe6bcca79802bf1ec5af6acf12aadd82 /arch/sparc/kernel/ds.c | |
parent | sparc: Use vsprintf extention %pf with builtin_return_address (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
download | linux-3423166fdbc2444bf3a4a27af1d7508364a17be7.tar.xz linux-3423166fdbc2444bf3a4a27af1d7508364a17be7.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Diffstat (limited to 'arch/sparc/kernel/ds.c')
-rw-r--r-- | arch/sparc/kernel/ds.c | 7 |
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); |