Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79ed35a9 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

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

parents 6a2e42ad b7887196

drivers/scsi/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -1665,7 +1665,7 @@ static void ahci_remove_one (struct pci_dev *pdev) 


static int __init ahci_init(void)

{

	return pci_module_init(&ahci_pci_driver);

	return pci_register_driver(&ahci_pci_driver);

}



static void __exit ahci_exit(void)

drivers/scsi/ata_piix.c

+2 −2
Original line number Diff line number Diff line
@@ -939,8 +939,8 @@ static int __init piix_init(void) 
{

	int rc;



	DPRINTK("pci_module_init\n");

	rc = pci_module_init(&piix_pci_driver);

	DPRINTK("pci_register_driver\n");

	rc = pci_register_driver(&piix_pci_driver);

	if (rc)

		return rc;

drivers/scsi/pdc_adma.c

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ static int adma_ata_init_one(struct pci_dev *pdev, 


static int __init adma_ata_init(void)

{

	return pci_module_init(&adma_ata_pci_driver);

	return pci_register_driver(&adma_ata_pci_driver);

}



static void __exit adma_ata_exit(void)

drivers/scsi/sata_mv.c

+1 −1
Original line number Diff line number Diff line
@@ -2447,7 +2447,7 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


static int __init mv_init(void)

{

	return pci_module_init(&mv_pci_driver);

	return pci_register_driver(&mv_pci_driver);

}



static void __exit mv_exit(void)

drivers/scsi/sata_nv.c

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static void nv_ck804_host_stop(struct ata_host_set *host_set) 


static int __init nv_init(void)

{

	return pci_module_init(&nv_pci_driver);

	return pci_register_driver(&nv_pci_driver);

}



static void __exit nv_exit(void)