diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 04:03:33 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 04:03:33 -0400 |
| commit | 66e8bb97055ff22a0e5ea89c0a75a35f8738cc96 (patch) | |
| tree | 4160d135081fbc99cab9426dbfce9299ec68fdee /include | |
| parent | e1c3e5014040869abd6ef2cdf987e7c74cb40ada (diff) | |
| parent | dc710afe95ee9b263ab593c11d86a684f1606872 (diff) | |
| download | talos-op-linux-66e8bb97055ff22a0e5ea89c0a75a35f8738cc96.tar.gz talos-op-linux-66e8bb97055ff22a0e5ea89c0a75a35f8738cc96.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/libata.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 6cc497a2b6da..66c3100c2b94 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -265,12 +265,14 @@ enum { /* ata_eh_info->flags */ ATA_EHI_HOTPLUGGED = (1 << 0), /* could have been hotplugged */ - ATA_EHI_RESUME_LINK = (1 << 1), /* need to resume link */ + ATA_EHI_RESUME_LINK = (1 << 1), /* resume link (reset modifier) */ ATA_EHI_NO_AUTOPSY = (1 << 2), /* no autopsy */ ATA_EHI_QUIET = (1 << 3), /* be quiet */ ATA_EHI_DID_RESET = (1 << 16), /* already reset this port */ + ATA_EHI_RESET_MODIFIER_MASK = ATA_EHI_RESUME_LINK, + /* max repeat if error condition is still set after ->error_handler */ ATA_EH_MAX_REPEAT = 5, |
