diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-01-28 20:52:40 +0100 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-01-28 20:52:40 +0100 |
| commit | b20f86625de738658c74f2ecfe4050416d2252cc (patch) | |
| tree | b84216b70bd923409217834a953f983700e39eda /include/scsi/scsi_host.h | |
| parent | atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume (diff) | |
| parent | Linux 3.3-rc1 (diff) | |
| download | linux-b20f86625de738658c74f2ecfe4050416d2252cc.tar.xz linux-b20f86625de738658c74f2ecfe4050416d2252cc.zip | |
Merge commit 'v3.3-rc1' into fbdev-next
Diffstat (limited to 'include/scsi/scsi_host.h')
| -rw-r--r-- | include/scsi/scsi_host.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 50266c9405fc..5f7d5b3b1c6e 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -669,6 +669,9 @@ struct Scsi_Host { /* Asynchronous scan in progress */ unsigned async_scan:1; + /* Don't resume host in EH */ + unsigned eh_noresume:1; + /* * Optional work queue to be utilized by the transport */ |