Browse Source

Merge branch 'upstream-fixes' into upstream

Jeff Garzik 19 years ago
parent
commit
6a2e42ad0f
1 changed files with 2 additions and 1 deletions
  1. 2 1
      drivers/scsi/pdc_adma.c

+ 2 - 1
drivers/scsi/pdc_adma.c

@@ -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,