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

[cascardo/linux.git] / drivers / scsi / sata_qstor.c

diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index 98ddc25..71bd671 100644 (file)
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -680,7 +680,7 @@ static int qs_ata_init_one(struct pci_dev *pdev,
        probe_ent->port_ops     = qs_port_info[board_idx].port_ops;
 
        probe_ent->irq          = pdev->irq;
-       probe_ent->irq_flags    = SA_SHIRQ;
+       probe_ent->irq_flags    = IRQF_SHARED;
        probe_ent->mmio_base    = mmio_base;
        probe_ent->n_ports      = QS_PORTS;
 
@@ -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)