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/i386/kernel | |
| parent | 80c0531514516e43ae118ddf38424e06e5c3cb3c (diff) | |
| parent | 93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'arch/i386/kernel')
| -rw-r--r-- | arch/i386/kernel/scx200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/scx200.c b/arch/i386/kernel/scx200.c index 9c968ae67c43..321f5fd26e75 100644 --- a/arch/i386/kernel/scx200.c +++ b/arch/i386/kernel/scx200.c | |||
| @@ -143,7 +143,7 @@ static int __init scx200_init(void) | |||
| 143 | { | 143 | { |
| 144 | printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n"); | 144 | printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n"); |
| 145 | 145 | ||
| 146 | return pci_module_init(&scx200_pci_driver); | 146 | return pci_register_driver(&scx200_pci_driver); |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | static void __exit scx200_cleanup(void) | 149 | static void __exit scx200_cleanup(void) |