diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-31 00:02:26 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-31 00:02:26 -0400 |
| commit | 481ff126e8d9be63809e7854badf815e54066eed (patch) | |
| tree | c682ce7a20bf129428fc0f3cc393f9c9b39ed678 /include/linux/libata.h | |
| parent | 669a5db411d85a14f86cd92bc16bf7ab5b8aa235 (diff) | |
| parent | 9bec2e38527a9f2497b3d976715c672d08d6160d (diff) | |
Merge branch 'upstream' into pata-drivers
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 a6d818148ae0..8715305f611f 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -198,7 +198,7 @@ enum { | |||
| 198 | 198 | ||
| 199 | /* host set flags */ | 199 | /* host set flags */ |
| 200 | ATA_HOST_SIMPLEX = (1 << 0), /* Host is simplex, one DMA channel per host only */ | 200 | ATA_HOST_SIMPLEX = (1 << 0), /* Host is simplex, one DMA channel per host only */ |
| 201 | 201 | ||
| 202 | /* various lengths of time */ | 202 | /* various lengths of time */ |
| 203 | ATA_TMOUT_BOOT = 30 * HZ, /* heuristic */ | 203 | ATA_TMOUT_BOOT = 30 * HZ, /* heuristic */ |
| 204 | ATA_TMOUT_BOOT_QUICK = 7 * HZ, /* heuristic */ | 204 | ATA_TMOUT_BOOT_QUICK = 7 * HZ, /* heuristic */ |