diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-10 06:56:51 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-10 06:56:51 -0400 |
commit | 79ed35a9f139ad2b2653dfdd5f45a8f1453e2cbb (patch) | |
tree | 1f97c3bfd3ae9995a1e396c5a6c02bf5a346b55c /drivers/scsi/sata_qstor.c | |
parent | 6a2e42ad0f7ac0f4093b96ed0c6744f09bdfce1d (diff) | |
parent | b7887196e38da54ff893897b80875d632d1a1114 (diff) | |
download | op-kernel-dev-79ed35a9f139ad2b2653dfdd5f45a8f1453e2cbb.zip op-kernel-dev-79ed35a9f139ad2b2653dfdd5f45a8f1453e2cbb.tar.gz |
Merge branch 'tj-upstream-pci_register_driver' of git://htj.dyndns.org/libata-tj into upstream
Diffstat (limited to 'drivers/scsi/sata_qstor.c')
-rw-r--r-- | drivers/scsi/sata_qstor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c index d374c1db..71bd671 100644 --- a/drivers/scsi/sata_qstor.c +++ b/drivers/scsi/sata_qstor.c @@ -712,7 +712,7 @@ err_out: static int __init qs_ata_init(void) { - return pci_module_init(&qs_ata_pci_driver); + return pci_register_driver(&qs_ata_pci_driver); } static void __exit qs_ata_exit(void) |