summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sata_mv.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-13 02:30:04 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-13 02:30:04 -0500
commite508a391a0705f770ef1c4f1c304678b0e8e4fe8 (patch)
tree5ba0357fb21e08e52b8e904e88ef692dc78855fb /drivers/scsi/sata_mv.c
parentd00d598ffbba974d9045ba8b95296655fe2162c5 (diff)
parent50630195bbdfe1ca775d94cd68a5f18bc1b717e4 (diff)
downloadop-kernel-dev-e508a391a0705f770ef1c4f1c304678b0e8e4fe8.zip
op-kernel-dev-e508a391a0705f770ef1c4f1c304678b0e8e4fe8.tar.gz
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/scsi/sata_mv.c')
-rw-r--r--drivers/scsi/sata_mv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index 3e7866b..b2bf16a 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -86,7 +86,8 @@ enum {
MV_FLAG_DUAL_HC = (1 << 30), /* two SATA Host Controllers */
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_SATA_RESET | ATA_FLAG_MMIO |
+ ATA_FLAG_NO_ATAPI),
MV_6XXX_FLAGS = MV_FLAG_IRQ_COALESCE,
CRQB_FLAG_READ = (1 << 0),
OpenPOWER on IntegriCloud