diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-28 12:04:15 -0400 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-28 12:04:15 -0400 |
| commit | 5ffa70b2a38befadb920b85fe87f5da2b4cff623 (patch) | |
| tree | 411b1d357731db5e2611f0ca67082a8c909b7d9d /include/linux/libata.h | |
| parent | 75864b301c91bf41ec2fb49ce4efb62fcb48b954 (diff) | |
| parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) | |
Merge tag 'v4.13-rc7' into mtd/next
Merge v4.13-rc7 back to resolve merge conflicts in
drivers/mtd/nand/nandsim.c and include/asm-generic/vmlinux.lds.h.
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 55de3da58b1c..931c32f1f18d 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -435,7 +435,7 @@ enum { | |||
| 435 | ATA_HORKAGE_NOLPM = (1 << 20), /* don't use LPM */ | 435 | ATA_HORKAGE_NOLPM = (1 << 20), /* don't use LPM */ |
| 436 | ATA_HORKAGE_WD_BROKEN_LPM = (1 << 21), /* some WDs have broken LPM */ | 436 | ATA_HORKAGE_WD_BROKEN_LPM = (1 << 21), /* some WDs have broken LPM */ |
| 437 | ATA_HORKAGE_ZERO_AFTER_TRIM = (1 << 22),/* guarantees zero after trim */ | 437 | ATA_HORKAGE_ZERO_AFTER_TRIM = (1 << 22),/* guarantees zero after trim */ |
| 438 | ATA_HORKAGE_NO_NCQ_LOG = (1 << 23), /* don't use NCQ for log read */ | 438 | ATA_HORKAGE_NO_DMA_LOG = (1 << 23), /* don't use DMA for log read */ |
| 439 | ATA_HORKAGE_NOTRIM = (1 << 24), /* don't use TRIM */ | 439 | ATA_HORKAGE_NOTRIM = (1 << 24), /* don't use TRIM */ |
| 440 | ATA_HORKAGE_MAX_SEC_1024 = (1 << 25), /* Limit max sects to 1024 */ | 440 | ATA_HORKAGE_MAX_SEC_1024 = (1 << 25), /* Limit max sects to 1024 */ |
| 441 | 441 | ||