diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /include/linux/libata.h | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
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 */ |