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/maestro.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/maestro.c')
| -rw-r--r-- | sound/oss/maestro.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/maestro.c b/sound/oss/maestro.c index f9ac5b16f61a..d4b569acf764 100644 --- a/sound/oss/maestro.c +++ b/sound/oss/maestro.c | |||
| @@ -3624,7 +3624,7 @@ static int __init init_maestro(void) | |||
| 3624 | { | 3624 | { |
| 3625 | int rc; | 3625 | int rc; |
| 3626 | 3626 | ||
| 3627 | rc = pci_module_init(&maestro_pci_driver); | 3627 | rc = pci_register_driver(&maestro_pci_driver); |
| 3628 | if (rc < 0) | 3628 | if (rc < 0) |
| 3629 | return rc; | 3629 | return rc; |
| 3630 | 3630 | ||
