diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-02 20:41:48 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-02 20:41:48 -0400 |
commit | 7819d64e31a685e35e4819515c84168d0879816e (patch) | |
tree | dd567398511128d63ac8bc10567279a68e9ddd37 /drivers/scsi/sata_promise.c | |
parent | a808be8a12d61cdacba350fdce2e448045be8202 (diff) | |
parent | af64371ada9452632c349563d688d30d94e918ba (diff) |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_promise.c')
-rw-r--r-- | drivers/scsi/sata_promise.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index 322525d84907..03c647cbfb59 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c | |||
@@ -678,10 +678,6 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e | |||
678 | if (!printed_version++) | 678 | if (!printed_version++) |
679 | dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); | 679 | dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); |
680 | 680 | ||
681 | /* | ||
682 | * If this driver happens to only be useful on Apple's K2, then | ||
683 | * we should check that here as it has a normal Serverworks ID | ||
684 | */ | ||
685 | rc = pci_enable_device(pdev); | 681 | rc = pci_enable_device(pdev); |
686 | if (rc) | 682 | if (rc) |
687 | return rc; | 683 | return rc; |