diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /include/linux/libata.h | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
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 */ |