diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /drivers/scsi/qla4xxx/ql4_init.c | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/scsi/qla4xxx/ql4_init.c')
| -rw-r--r-- | drivers/scsi/qla4xxx/ql4_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c index bb3a1c11f44c..9e81b810dc88 100644 --- a/drivers/scsi/qla4xxx/ql4_init.c +++ b/drivers/scsi/qla4xxx/ql4_init.c | |||
| @@ -978,7 +978,7 @@ static int qla4xxx_start_firmware_from_flash(struct scsi_qla_host *ha) | |||
| 978 | return status; | 978 | return status; |
| 979 | } | 979 | } |
| 980 | 980 | ||
| 981 | static int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a) | 981 | int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a) |
| 982 | { | 982 | { |
| 983 | #define QL4_LOCK_DRVR_WAIT 300 | 983 | #define QL4_LOCK_DRVR_WAIT 300 |
| 984 | #define QL4_LOCK_DRVR_SLEEP 100 | 984 | #define QL4_LOCK_DRVR_SLEEP 100 |