summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ata_piix.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-10 12:56:51 +0200
committerJeff Garzik <jeff@garzik.org>2006-08-10 12:56:51 +0200
commit79ed35a9f139ad2b2653dfdd5f45a8f1453e2cbb (patch)
tree1f97c3bfd3ae9995a1e396c5a6c02bf5a346b55c /drivers/scsi/ata_piix.c
parentMerge branch 'upstream-fixes' into upstream (diff)
parent[PATCH] libata: replace pci_module_init() with pci_register_driver() (diff)
downloadlinux-79ed35a9f139ad2b2653dfdd5f45a8f1453e2cbb.tar.xz
linux-79ed35a9f139ad2b2653dfdd5f45a8f1453e2cbb.zip
Merge branch 'tj-upstream-pci_register_driver' of git://htj.dyndns.org/libata-tj into upstream
Diffstat (limited to 'drivers/scsi/ata_piix.c')
-rw-r--r--drivers/scsi/ata_piix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 501755a606ed..46c34fd5af8f 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -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;