aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sata_sil.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-10 06:56:51 -0400
committerJeff Garzik <jeff@garzik.org>2006-08-10 06:56:51 -0400
commit79ed35a9f139ad2b2653dfdd5f45a8f1453e2cbb (patch)
tree1f97c3bfd3ae9995a1e396c5a6c02bf5a346b55c /drivers/scsi/sata_sil.c
parentMerge branch 'upstream-fixes' into upstream (diff)
parent[PATCH] libata: replace pci_module_init() with pci_register_driver() (diff)
downloadlinux-dev-79ed35a9f139ad2b2653dfdd5f45a8f1453e2cbb.tar.xz
linux-dev-79ed35a9f139ad2b2653dfdd5f45a8f1453e2cbb.zip
Merge branch 'tj-upstream-pci_register_driver' of git://htj.dyndns.org/libata-tj into upstream
Diffstat (limited to 'drivers/scsi/sata_sil.c')
-rw-r--r--drivers/scsi/sata_sil.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index f4e262b06cf2..907faa87239b 100644
--- 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)