diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 02:41:42 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 02:41:42 (GMT) |
| commit | 977127174a7dff52d17faeeb4c4949a54221881f (patch) | |
| tree | b05b9d18a1256d7ed97bdfb537213a8d70ccca57 /sound/oss/sonicvibes.c | |
| parent | 80c0531514516e43ae118ddf38424e06e5c3cb3c (diff) | |
| parent | 93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff) | |
| download | linux-977127174a7dff52d17faeeb4c4949a54221881f.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'sound/oss/sonicvibes.c')
| -rw-r--r-- | sound/oss/sonicvibes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c index 17d0e46..71b05e2 100644 --- a/sound/oss/sonicvibes.c +++ b/sound/oss/sonicvibes.c @@ -2765,7 +2765,7 @@ static int __init init_sonicvibes(void) if (!(wavetable_mem = __get_free_pages(GFP_KERNEL, 20-PAGE_SHIFT))) printk(KERN_INFO "sv: cannot allocate 1MB of contiguous nonpageable memory for wavetable data\n"); #endif - return pci_module_init(&sv_driver); + return pci_register_driver(&sv_driver); } static void __exit cleanup_sonicvibes(void) |