diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-07-03 10:41:12 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-07-03 10:41:12 -0400 |
| commit | c4e00fac42f268ed0a547cdd1d12bb8399864040 (patch) | |
| tree | 1a54d87be2066c49b71a03764fcb4fc7f9c68c41 /drivers/scsi/qla2xxx/qla_fw.h | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
| parent | d6b0c53723753fc0cfda63f56735b225c43e1e9a (diff) | |
Merge ../scsi-misc-2.6
Conflicts:
drivers/scsi/nsp32.c
drivers/scsi/pcmcia/nsp_cs.c
Removal of randomness flag conflicts with SA_ -> IRQF_ global
replacement.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_fw.h')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_fw.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h index 3af478663be7..a0a722cf4237 100644 --- a/drivers/scsi/qla2xxx/qla_fw.h +++ b/drivers/scsi/qla2xxx/qla_fw.h | |||
| @@ -141,7 +141,7 @@ struct nvram_24xx { | |||
| 141 | * BIT 2 = Enable Memory Map BIOS | 141 | * BIT 2 = Enable Memory Map BIOS |
| 142 | * BIT 3 = Enable Selectable Boot | 142 | * BIT 3 = Enable Selectable Boot |
| 143 | * BIT 4 = Disable RISC code load | 143 | * BIT 4 = Disable RISC code load |
| 144 | * BIT 5 = | 144 | * BIT 5 = Disable Serdes |
| 145 | * BIT 6 = | 145 | * BIT 6 = |
| 146 | * BIT 7 = | 146 | * BIT 7 = |
| 147 | * | 147 | * |
| @@ -278,7 +278,7 @@ struct init_cb_24xx { | |||
| 278 | uint16_t response_q_length; | 278 | uint16_t response_q_length; |
| 279 | uint16_t request_q_length; | 279 | uint16_t request_q_length; |
| 280 | 280 | ||
| 281 | uint16_t link_down_timeout; /* Milliseconds. */ | 281 | uint16_t link_down_on_nos; /* Milliseconds. */ |
| 282 | 282 | ||
| 283 | uint16_t prio_request_q_length; | 283 | uint16_t prio_request_q_length; |
| 284 | 284 | ||