diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2010-11-10 13:51:27 (GMT) |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-11-10 13:51:27 (GMT) |
commit | 00e375e7e962f938f6b3c93e4cd097a5e26cc788 (patch) | |
tree | 9aacf8566c688273af830fc4e50186810068b028 /drivers/block/cciss.h | |
parent | f85acd81aa623e3dcf268c90e5cd8ecf36830984 (diff) | |
parent | 4205df34003eec4371020872cdfa228ffae5bd6a (diff) | |
download | linux-fsl-qoriq-00e375e7e962f938f6b3c93e4cd097a5e26cc788.tar.xz |
Merge branch 'for-2.6.37/drivers' into for-linus
Conflicts:
drivers/block/cciss.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/cciss.h')
-rw-r--r-- | drivers/block/cciss.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h index ae340ff..4b8933d 100644 --- a/drivers/block/cciss.h +++ b/drivers/block/cciss.h @@ -200,10 +200,14 @@ struct ctlr_info * the above. */ #define CCISS_BOARD_READY_WAIT_SECS (120) +#define CCISS_BOARD_NOT_READY_WAIT_SECS (10) #define CCISS_BOARD_READY_POLL_INTERVAL_MSECS (100) #define CCISS_BOARD_READY_ITERATIONS \ ((CCISS_BOARD_READY_WAIT_SECS * 1000) / \ CCISS_BOARD_READY_POLL_INTERVAL_MSECS) +#define CCISS_BOARD_NOT_READY_ITERATIONS \ + ((CCISS_BOARD_NOT_READY_WAIT_SECS * 1000) / \ + CCISS_BOARD_READY_POLL_INTERVAL_MSECS) #define CCISS_POST_RESET_PAUSE_MSECS (3000) #define CCISS_POST_RESET_NOOP_INTERVAL_MSECS (1000) #define CCISS_POST_RESET_NOOP_RETRIES (12) |