Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-3.10.git] / drivers / block / sx8.c

diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 4bdf95716e2b253fc45334ec079b90a0c8014a09..2ae08b343b935518c86098959866299e73f213e8 100644 (file)
--- 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)