diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 13:03:24 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 13:03:24 -0400 |
| commit | 8973a585aec125beb2a3de50bb491004299f53d5 (patch) | |
| tree | 3f069a9c7eff2c916e02427fd9800ce2b55a4a90 /drivers/scsi/sata_svw.c | |
| parent | 907f4678c114a125fe4584758681c31bf3d627da (diff) | |
| parent | bef9c558841604116704e10b3d9ff3dbf4939423 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'drivers/scsi/sata_svw.c')
| -rw-r--r-- | drivers/scsi/sata_svw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c index 8d1a5d25c053..05075bd3a893 100644 --- a/drivers/scsi/sata_svw.c +++ b/drivers/scsi/sata_svw.c | |||
| @@ -395,7 +395,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e | |||
| 395 | 395 | ||
| 396 | /* Clear a magic bit in SCR1 according to Darwin, those help | 396 | /* Clear a magic bit in SCR1 according to Darwin, those help |
| 397 | * some funky seagate drives (though so far, those were already | 397 | * some funky seagate drives (though so far, those were already |
| 398 | * set by the firmware on the machines I had access to | 398 | * set by the firmware on the machines I had access to) |
| 399 | */ | 399 | */ |
| 400 | writel(readl(mmio_base + K2_SATA_SICR1_OFFSET) & ~0x00040000, | 400 | writel(readl(mmio_base + K2_SATA_SICR1_OFFSET) & ~0x00040000, |
| 401 | mmio_base + K2_SATA_SICR1_OFFSET); | 401 | mmio_base + K2_SATA_SICR1_OFFSET); |