diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-12-13 10:15:39 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-12-13 10:15:39 -0800 |
| commit | da8543ef125afc7bba4da526b61a1ae07dc25109 (patch) | |
| tree | 6aec5867f8e054c22c6208032280ed1434c14a58 /drivers/scsi/sata_mv.c | |
| parent | ec637e3ffb6b978143652477c7c5f96c9519b691 (diff) | |
| parent | 90ac8f7741be4ff66de1f52904f4f67f272f74ce (diff) | |
| download | linux-da8543ef125afc7bba4da526b61a1ae07dc25109.tar.gz linux-da8543ef125afc7bba4da526b61a1ae07dc25109.tar.xz | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/scsi/sata_mv.c')
| -rw-r--r-- | drivers/scsi/sata_mv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index ab7432a5778e..9321cdf45680 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), |