aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pdc_adma.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/pdc_adma.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/pdc_adma.c')
-rw-r--r--drivers/scsi/pdc_adma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c
index efc8fff1d250..61d2aa697b4d 100644
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@ -722,7 +722,7 @@ err_out:
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)