diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /drivers/ata/sata_uli.c | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
Diffstat (limited to 'drivers/ata/sata_uli.c')
| -rw-r--r-- | drivers/ata/sata_uli.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c index 5c603ca3a50a..a43aec62d505 100644 --- a/drivers/ata/sata_uli.c +++ b/drivers/ata/sata_uli.c | |||
| @@ -128,7 +128,8 @@ static const struct ata_port_operations uli_ops = { | |||
| 128 | 128 | ||
| 129 | static struct ata_port_info uli_port_info = { | 129 | static struct ata_port_info uli_port_info = { |
| 130 | .sht = &uli_sht, | 130 | .sht = &uli_sht, |
| 131 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 131 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
| 132 | ATA_FLAG_IGN_SIMPLEX, | ||
| 132 | .pio_mask = 0x1f, /* pio0-4 */ | 133 | .pio_mask = 0x1f, /* pio0-4 */ |
| 133 | .udma_mask = 0x7f, /* udma0-6 */ | 134 | .udma_mask = 0x7f, /* udma0-6 */ |
| 134 | .port_ops = &uli_ops, | 135 | .port_ops = &uli_ops, |