diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /drivers/scsi/qla4xxx/ql4_def.h | |
| parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla4xxx/ql4_def.h')
| -rw-r--r-- | drivers/scsi/qla4xxx/ql4_def.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h index 4249e52a5592..6f4cf2dd2f4a 100644 --- a/drivers/scsi/qla4xxx/ql4_def.h +++ b/drivers/scsi/qla4xxx/ql4_def.h | |||
| @@ -418,7 +418,6 @@ struct scsi_qla_host { | |||
| 418 | * concurrently. | 418 | * concurrently. |
| 419 | */ | 419 | */ |
| 420 | struct mutex mbox_sem; | 420 | struct mutex mbox_sem; |
| 421 | wait_queue_head_t mailbox_wait_queue; | ||
| 422 | 421 | ||
| 423 | /* temporary mailbox status registers */ | 422 | /* temporary mailbox status registers */ |
| 424 | volatile uint8_t mbox_status_count; | 423 | volatile uint8_t mbox_status_count; |