diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/scsi/sata_uli.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/scsi/sata_uli.c')
| -rw-r--r-- | drivers/scsi/sata_uli.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c index 1566886815fb..42e13ed8eb5b 100644 --- a/drivers/scsi/sata_uli.c +++ b/drivers/scsi/sata_uli.c | |||
| @@ -125,8 +125,8 @@ static struct ata_port_info uli_port_info = { | |||
| 125 | .sht = &uli_sht, | 125 | .sht = &uli_sht, |
| 126 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET | | 126 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET | |
| 127 | ATA_FLAG_NO_LEGACY, | 127 | ATA_FLAG_NO_LEGACY, |
| 128 | .pio_mask = 0x03, //support pio mode 4 (FIXME) | 128 | .pio_mask = 0x1f, /* pio0-4 */ |
| 129 | .udma_mask = 0x7f, //support udma mode 6 | 129 | .udma_mask = 0x7f, /* udma0-6 */ |
| 130 | .port_ops = &uli_ops, | 130 | .port_ops = &uli_ops, |
| 131 | }; | 131 | }; |
| 132 | 132 | ||