Skip to content

L
linux-davinci
Commit 6a2e42ad authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

Merge branch 'upstream-fixes' into upstream

parents 8b881b04 51704c60
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
drivers/scsi/pdc_adma.c
View file @ 6a2e42ad
...@@ -183,7 +183,8 @@ static struct ata_port_info adma_port_info[] = { ...@@ -183,7 +183,8 @@ static struct ata_port_info adma_port_info[] = {
{ {
.sht = &adma_ata_sht, .sht = &adma_ata_sht,
.host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | .host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST |
ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO, ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO |
ATA_FLAG_PIO_POLLING,
.pio_mask = 0x10, /* pio4 */ .pio_mask = 0x10, /* pio4 */
.udma_mask = 0x1f, /* udma0-4 */ .udma_mask = 0x1f, /* udma0-4 */
.port_ops = &adma_ata_ops, .port_ops = &adma_ata_ops,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment