Merge branch 'upstream-fixes' into upstream

6a2e42ad · Jeff Garzik · 8b881b04 · 51704c60 · 6a2e42ad
Commit 6a2e42ad authored Aug 10, 2006 by Jeff Garzik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

drivers/scsi/pdc_adma.c drivers/scsi/pdc_adma.c +2 -1

No files found.
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@ -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,