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/ata_piix.c | |
| parent | 6a2e42ad0f7ac0f4093b96ed0c6744f09bdfce1d (diff) | |
| parent | b7887196e38da54ff893897b80875d632d1a1114 (diff) | |
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.c | 4 |
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) | |||
| 939 | { | 939 | { |
| 940 | int rc; | 940 | int rc; |
| 941 | 941 | ||
| 942 | DPRINTK("pci_module_init\n"); | 942 | DPRINTK("pci_register_driver\n"); |
| 943 | rc = pci_module_init(&piix_pci_driver); | 943 | rc = pci_register_driver(&piix_pci_driver); |
| 944 | if (rc) | 944 | if (rc) |
| 945 | return rc; | 945 | return rc; |
| 946 | 946 | ||