diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 08:55:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 08:55:00 -0700 |
commit | ad542ef5b2296fa7a8518e6be67c4588b750d316 (patch) | |
tree | e039ed07c5cd2163dee880cb7970a70333c532aa /drivers/scsi/sata_svw.c | |
parent | ff96b3d4b840e8aa126e0a60fd743417ffdee178 (diff) | |
parent | f3ac91cf521be4637236d2dcb7ad4aa91f8865f0 (diff) |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-2.6.git
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 8d1a5d25c05..05075bd3a89 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 /* Clear a magic bit in SCR1 according to Darwin, those help * some funky seagate drives (though so far, those were already - * set by the firmware on the machines I had access to + * set by the firmware on the machines I had access to) */ writel(readl(mmio_base + K2_SATA_SICR1_OFFSET) & ~0x00040000, mmio_base + K2_SATA_SICR1_OFFSET); |