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 /arch/mips | |
| parent | 80c0531514516e43ae118ddf38424e06e5c3cb3c (diff) | |
| parent | 93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/vr41xx/common/vrc4173.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/vr41xx/common/vrc4173.c b/arch/mips/vr41xx/common/vrc4173.c index 462a9af30eef..cc52e75e14e7 100644 --- a/arch/mips/vr41xx/common/vrc4173.c +++ b/arch/mips/vr41xx/common/vrc4173.c | |||
| @@ -561,7 +561,7 @@ static int __devinit vrc4173_init(void) | |||
| 561 | { | 561 | { |
| 562 | int err; | 562 | int err; |
| 563 | 563 | ||
| 564 | err = pci_module_init(&vrc4173_driver); | 564 | err = pci_register_driver(&vrc4173_driver); |
| 565 | if (err < 0) | 565 | if (err < 0) |
| 566 | return err; | 566 | return err; |
| 567 | 567 | ||