Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a2e42ad authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' into upstream

parents 8b881b04 51704c60

drivers/scsi/pdc_adma.c

+2 −1
Original line number Diff line number Diff line
@@ -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,