diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /include/linux/libata.h | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
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 c71f46960f39..7f675aa81d87 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -364,7 +364,7 @@ enum { | |||
| 364 | ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 6, | 364 | ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 6, |
| 365 | 365 | ||
| 366 | /* Horkage types. May be set by libata or controller on drives | 366 | /* Horkage types. May be set by libata or controller on drives |
| 367 | (some horkage may be drive/controller pair dependant */ | 367 | (some horkage may be drive/controller pair dependent */ |
| 368 | 368 | ||
| 369 | ATA_HORKAGE_DIAGNOSTIC = (1 << 0), /* Failed boot diag */ | 369 | ATA_HORKAGE_DIAGNOSTIC = (1 << 0), /* Failed boot diag */ |
| 370 | ATA_HORKAGE_NODMA = (1 << 1), /* DMA problems */ | 370 | ATA_HORKAGE_NODMA = (1 << 1), /* DMA problems */ |