diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /drivers/net/irda/vlsi_ir.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'drivers/net/irda/vlsi_ir.c')
| -rw-r--r-- | drivers/net/irda/vlsi_ir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index a9f49f058cfb..97a49e0be76b 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
| @@ -1887,7 +1887,7 @@ static int __init vlsi_mod_init(void) | |||
| 1887 | vlsi_proc_root->owner = THIS_MODULE; | 1887 | vlsi_proc_root->owner = THIS_MODULE; |
| 1888 | } | 1888 | } |
| 1889 | 1889 | ||
| 1890 | ret = pci_module_init(&vlsi_irda_driver); | 1890 | ret = pci_register_driver(&vlsi_irda_driver); |
| 1891 | 1891 | ||
| 1892 | if (ret && vlsi_proc_root) | 1892 | if (ret && vlsi_proc_root) |
| 1893 | remove_proc_entry(PROC_DIR, NULL); | 1893 | remove_proc_entry(PROC_DIR, NULL); |