diff options
| author | Tejun Heo <tj@kernel.org> | 2014-01-16 09:44:34 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-01-16 09:44:34 -0500 |
| commit | 6e1af69780a4df749d28a129596ed576a0d7996c (patch) | |
| tree | 67f0dee7b39c006dc305d7273db8222633603abf /include/linux/libata.h | |
| parent | a96cc303e42ad7830dde929aad0046e448a05505 (diff) | |
| parent | 55c82a6c2a513de1d8a20c3b3a769129a1a14d50 (diff) | |
Merge branch 'for-3.13-fixes' into for-3.14
A scheduled horkage patch will conflict with HORKAGE changes in
for-3.13-fixes. Pull in to avoid unnecessary merge conflicts.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 0e23c26485f4..9b503376738f 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -418,6 +418,7 @@ enum { ATA_HORKAGE_DUMP_ID = (1 << 16), /* dump IDENTIFY data */ ATA_HORKAGE_MAX_SEC_LBA48 = (1 << 17), /* Set max sects to 65535 */ ATA_HORKAGE_ATAPI_DMADIR = (1 << 18), /* device requires dmadir */ + ATA_HORKAGE_NO_NCQ_TRIM = (1 << 19), /* don't use queued TRIM */ /* DMA mask for user DMA control: User visible values; DO NOT renumber */ |