diff options
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_base.h')
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h index 998a7b847b3d..15827582a90e 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.h +++ b/drivers/scsi/mpt2sas/mpt2sas_base.h | |||
@@ -432,7 +432,7 @@ typedef void (*MPT_ADD_SGE)(void *paddr, u32 flags_length, dma_addr_t dma_addr); | |||
432 | * @fw_event_list: list of fw events | 432 | * @fw_event_list: list of fw events |
433 | * @aen_event_read_flag: event log was read | 433 | * @aen_event_read_flag: event log was read |
434 | * @broadcast_aen_busy: broadcast aen waiting to be serviced | 434 | * @broadcast_aen_busy: broadcast aen waiting to be serviced |
435 | * @ioc_reset_in_progress: host reset in progress | 435 | * @shost_recovery: host reset in progress |
436 | * @ioc_reset_in_progress_lock: | 436 | * @ioc_reset_in_progress_lock: |
437 | * @ioc_link_reset_in_progress: phy/hard reset in progress | 437 | * @ioc_link_reset_in_progress: phy/hard reset in progress |
438 | * @ignore_loginfos: ignore loginfos during task managment | 438 | * @ignore_loginfos: ignore loginfos during task managment |
@@ -545,7 +545,6 @@ struct MPT2SAS_ADAPTER { | |||
545 | /* misc flags */ | 545 | /* misc flags */ |
546 | int aen_event_read_flag; | 546 | int aen_event_read_flag; |
547 | u8 broadcast_aen_busy; | 547 | u8 broadcast_aen_busy; |
548 | u8 ioc_reset_in_progress; | ||
549 | u8 shost_recovery; | 548 | u8 shost_recovery; |
550 | spinlock_t ioc_reset_in_progress_lock; | 549 | spinlock_t ioc_reset_in_progress_lock; |
551 | u8 ioc_link_reset_in_progress; | 550 | u8 ioc_link_reset_in_progress; |