diff options
Diffstat (limited to 'drivers/scsi/aacraid/aacraid.h')
-rw-r--r-- | drivers/scsi/aacraid/aacraid.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 2d430b7e8cf4..9ce7002bd070 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h | |||
@@ -997,7 +997,7 @@ struct aac_dev | |||
997 | int maximum_num_physicals; | 997 | int maximum_num_physicals; |
998 | int maximum_num_channels; | 998 | int maximum_num_channels; |
999 | struct fsa_dev_info *fsa_dev; | 999 | struct fsa_dev_info *fsa_dev; |
1000 | pid_t thread_pid; | 1000 | struct task_struct *thread; |
1001 | int cardtype; | 1001 | int cardtype; |
1002 | 1002 | ||
1003 | /* | 1003 | /* |
@@ -1017,7 +1017,6 @@ struct aac_dev | |||
1017 | * AIF thread states | 1017 | * AIF thread states |
1018 | */ | 1018 | */ |
1019 | u32 aif_thread; | 1019 | u32 aif_thread; |
1020 | struct completion aif_completion; | ||
1021 | struct aac_adapter_info adapter_info; | 1020 | struct aac_adapter_info adapter_info; |
1022 | struct aac_supplement_adapter_info supplement_adapter_info; | 1021 | struct aac_supplement_adapter_info supplement_adapter_info; |
1023 | /* These are in adapter info but they are in the io flow so | 1022 | /* These are in adapter info but they are in the io flow so |
@@ -1797,7 +1796,7 @@ int aac_sa_init(struct aac_dev *dev); | |||
1797 | unsigned int aac_response_normal(struct aac_queue * q); | 1796 | unsigned int aac_response_normal(struct aac_queue * q); |
1798 | unsigned int aac_command_normal(struct aac_queue * q); | 1797 | unsigned int aac_command_normal(struct aac_queue * q); |
1799 | unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index); | 1798 | unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index); |
1800 | int aac_command_thread(struct aac_dev * dev); | 1799 | int aac_command_thread(void *data); |
1801 | int aac_close_fib_context(struct aac_dev * dev, struct aac_fib_context *fibctx); | 1800 | int aac_close_fib_context(struct aac_dev * dev, struct aac_fib_context *fibctx); |
1802 | int aac_fib_adapter_complete(struct fib * fibptr, unsigned short size); | 1801 | int aac_fib_adapter_complete(struct fib * fibptr, unsigned short size); |
1803 | struct aac_driver_ident* aac_get_driver_ident(int devtype); | 1802 | struct aac_driver_ident* aac_get_driver_ident(int devtype); |