Merge branch 'tj-upstream-pci_register_driver' of git://htj.dyndns.org/libata-tj...

[sfrench/cifs-2.6.git] / drivers / scsi / sata_sil.c

diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index f4e262b06cf2d8571d3306416a0535ad49d5028d..907faa87239b20d59515b4bc5a3faf904ed98a55 100644 (file)
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -710,7 +710,7 @@ static int sil_pci_device_resume(struct pci_dev *pdev)
 
 static int __init sil_init(void)
 {
-       return pci_module_init(&sil_pci_driver);
+       return pci_register_driver(&sil_pci_driver);
 }
 
 static void __exit sil_exit(void)