diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-19 00:10:32 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-19 00:10:32 -0500 |
| commit | cea555d384b85271035814c5adad23e6c7fc5d2a (patch) | |
| tree | 1181b6333a69a135293ec75f8a48c849ee32c015 /drivers/scsi/qla2xxx/qla_def.h | |
| parent | 78608dd32ce46789e970d6c3c423cd668c138d6c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_def.h')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_def.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index f25f41a499e5..b97194096d8e 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
| @@ -2547,7 +2547,6 @@ typedef struct scsi_qla_host { | |||
| 2547 | uint8_t fcode_revision[16]; | 2547 | uint8_t fcode_revision[16]; |
| 2548 | uint32_t fw_revision[4]; | 2548 | uint32_t fw_revision[4]; |
| 2549 | 2549 | ||
| 2550 | uint16_t fdt_odd_index; | ||
| 2551 | uint32_t fdt_wrt_disable; | 2550 | uint32_t fdt_wrt_disable; |
| 2552 | uint32_t fdt_erase_cmd; | 2551 | uint32_t fdt_erase_cmd; |
| 2553 | uint32_t fdt_block_size; | 2552 | uint32_t fdt_block_size; |