Skip to content

Commit

Permalink
Merge branch 'upstream-fixes' into upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Garzik committed Aug 10, 2006
2 parents 8b881b0 + 51704c6 commit 6a2e42a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/scsi/pdc_adma.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ static struct ata_port_info adma_port_info[] = {
{
.sht = &adma_ata_sht,
.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 */
.udma_mask = 0x1f, /* udma0-4 */
.port_ops = &adma_ata_ops,
Expand Down

0 comments on commit 6a2e42a

Please sign in to comment.