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_sx4.c | |
parent | a808be8a12d61cdacba350fdce2e448045be8202 (diff) | |
parent | af64371ada9452632c349563d688d30d94e918ba (diff) |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_sx4.c')
-rw-r--r-- | drivers/scsi/sata_sx4.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c index 45c78c399bfd..13dba63f6167 100644 --- a/drivers/scsi/sata_sx4.c +++ b/drivers/scsi/sata_sx4.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include "sata_promise.h" | 46 | #include "sata_promise.h" |
47 | 47 | ||
48 | #define DRV_NAME "sata_sx4" | 48 | #define DRV_NAME "sata_sx4" |
49 | #define DRV_VERSION "0.8" | 49 | #define DRV_VERSION "0.9" |
50 | 50 | ||
51 | 51 | ||
52 | enum { | 52 | enum { |
@@ -1376,10 +1376,6 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id * | |||
1376 | if (!printed_version++) | 1376 | if (!printed_version++) |
1377 | dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); | 1377 | dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); |
1378 | 1378 | ||
1379 | /* | ||
1380 | * If this driver happens to only be useful on Apple's K2, then | ||
1381 | * we should check that here as it has a normal Serverworks ID | ||
1382 | */ | ||
1383 | rc = pci_enable_device(pdev); | 1379 | rc = pci_enable_device(pdev); |
1384 | if (rc) | 1380 | if (rc) |
1385 | return rc; | 1381 | return rc; |