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/lpfc/lpfc.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/lpfc/lpfc.h')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h index 087c44539a16..f81691fcf177 100644 --- a/drivers/scsi/lpfc/lpfc.h +++ b/drivers/scsi/lpfc/lpfc.h | |||
| @@ -174,7 +174,6 @@ struct lpfc_hba { | |||
| 174 | dma_addr_t slim2p_mapping; | 174 | dma_addr_t slim2p_mapping; |
| 175 | uint16_t pci_cfg_value; | 175 | uint16_t pci_cfg_value; |
| 176 | 176 | ||
| 177 | struct semaphore hba_can_block; | ||
| 178 | int32_t hba_state; | 177 | int32_t hba_state; |
| 179 | 178 | ||
| 180 | #define LPFC_STATE_UNKNOWN 0 /* HBA state is unknown */ | 179 | #define LPFC_STATE_UNKNOWN 0 /* HBA state is unknown */ |