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 /drivers/block/sx8.c | |
| parent | 80c0531514516e43ae118ddf38424e06e5c3cb3c (diff) | |
| parent | 93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/block/sx8.c')
| -rw-r--r-- | drivers/block/sx8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index 4bdf95716e2b..2ae08b343b93 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c | |||
| @@ -1755,7 +1755,7 @@ static void carm_remove_one (struct pci_dev *pdev) | |||
| 1755 | 1755 | ||
| 1756 | static int __init carm_init(void) | 1756 | static int __init carm_init(void) |
| 1757 | { | 1757 | { |
| 1758 | return pci_module_init(&carm_driver); | 1758 | return pci_register_driver(&carm_driver); |
| 1759 | } | 1759 | } |
| 1760 | 1760 | ||
| 1761 | static void __exit carm_exit(void) | 1761 | static void __exit carm_exit(void) |