diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 02:30:04 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 02:30:04 -0500 |
commit | e508a391a0705f770ef1c4f1c304678b0e8e4fe8 (patch) | |
tree | 5ba0357fb21e08e52b8e904e88ef692dc78855fb /drivers/scsi/sata_sx4.c | |
parent | d00d598ffbba974d9045ba8b95296655fe2162c5 (diff) | |
parent | 50630195bbdfe1ca775d94cd68a5f18bc1b717e4 (diff) | |
download | op-kernel-dev-e508a391a0705f770ef1c4f1c304678b0e8e4fe8.zip op-kernel-dev-e508a391a0705f770ef1c4f1c304678b0e8e4fe8.tar.gz |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/scsi/sata_sx4.c')
-rw-r--r-- | drivers/scsi/sata_sx4.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c index 58da854..94b253b 100644 --- a/drivers/scsi/sata_sx4.c +++ b/drivers/scsi/sata_sx4.c @@ -220,7 +220,8 @@ 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_SRST | ATA_FLAG_MMIO | + ATA_FLAG_NO_ATAPI, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = 0x7f, /* udma0-6 ; FIXME */ |