Commit 1f3461a7 authored May 23, 2006 by Albert Lee Committed by Jeff Garzik May 24, 2006

[PATCH] libata: minor fix for irq-pio merge



Minor fix to put the ATA_FLAG_NO_ATAPI flag back.

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent c81e29b4

drivers/scsi/sata_mv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ enum {
		MV_FLAG_IRQ_COALESCE = (1 << 29), /* IRQ coalescing capability */
		MV_COMMON_FLAGS = (ATA_FLAG_SATA \| ATA_FLAG_NO_LEGACY \|
		ATA_FLAG_SATA_RESET \| ATA_FLAG_MMIO \|
		ATA_FLAG_PIO_POLLING),
		ATA_FLAG_NO_ATAPI \| ATA_FLAG_PIO_POLLING),
		MV_6XXX_FLAGS = MV_FLAG_IRQ_COALESCE,

		CRQB_FLAG_READ = (1 << 0),

drivers/scsi/sata_sx4.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,7 @@ static const struct ata_port_info pdc_port_info[] = {
		.sht = &pdc_sata_sht,
		.host_flags = ATA_FLAG_SATA \| ATA_FLAG_NO_LEGACY \|
		ATA_FLAG_SRST \| ATA_FLAG_MMIO \|
		ATA_FLAG_PIO_POLLING,
		ATA_FLAG_NO_ATAPI \| ATA_FLAG_PIO_POLLING,
		.pio_mask = 0x1f, /* pio0-4 */
		.mwdma_mask = 0x07, /* mwdma0-2 */
		.udma_mask = 0x7f, /* udma0-6 ; FIXME */