diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 21:41:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 21:41:42 -0500 |
commit | 977127174a7dff52d17faeeb4c4949a54221881f (patch) | |
tree | b05b9d18a1256d7ed97bdfb537213a8d70ccca57 /sound/oss/ymfpci.c | |
parent | 80c0531514516e43ae118ddf38424e06e5c3cb3c (diff) | |
parent | 93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'sound/oss/ymfpci.c')
-rw-r--r-- | sound/oss/ymfpci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/ymfpci.c b/sound/oss/ymfpci.c index 8dae59bd05a2..f8bd72e46f57 100644 --- a/sound/oss/ymfpci.c +++ b/sound/oss/ymfpci.c | |||
@@ -2680,7 +2680,7 @@ static struct pci_driver ymfpci_driver = { | |||
2680 | 2680 | ||
2681 | static int __init ymf_init_module(void) | 2681 | static int __init ymf_init_module(void) |
2682 | { | 2682 | { |
2683 | return pci_module_init(&ymfpci_driver); | 2683 | return pci_register_driver(&ymfpci_driver); |
2684 | } | 2684 | } |
2685 | 2685 | ||
2686 | static void __exit ymf_cleanup_module (void) | 2686 | static void __exit ymf_cleanup_module (void) |