diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:41:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:41:42 -0800 |
| commit | 977127174a7dff52d17faeeb4c4949a54221881f (patch) | |
| tree | b05b9d18a1256d7ed97bdfb537213a8d70ccca57 /drivers/block/sx8.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6 (diff) | |
| parent | [PATCH] drivers/*rest*: Replace pci_module_init() with pci_register_driver() (diff) | |
| download | wireguard-linux-977127174a7dff52d17faeeb4c4949a54221881f.tar.xz wireguard-linux-977127174a7dff52d17faeeb4c4949a54221881f.zip | |
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) static int __init carm_init(void) { - return pci_module_init(&carm_driver); + return pci_register_driver(&carm_driver); } static void __exit carm_exit(void) |