summaryrefslogtreecommitdiff
path: root/drivers/message/fusion/mptbase.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-03 21:03:28 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-03 21:03:28 -0500
commit2fde9901f6702ab82b5b2740fec9a7f9a80ddde4 (patch)
tree0ca92fabd4169095a50b43b8981d2a6c54f98531 /drivers/message/fusion/mptbase.h
parentf89c2b464558a21fd3be8d578b7d13e810fb6b8a (diff)
parent3b6efee9231e12fce09c94930bfc59f66f18d662 (diff)
Merge branch 'master'
Diffstat (limited to 'drivers/message/fusion/mptbase.h')
-rw-r--r--drivers/message/fusion/mptbase.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 5f5b3fb5b4d7..bac8eb4186d2 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -611,6 +611,8 @@ typedef struct _MPT_ADAPTER
int DoneCtx;
int TaskCtx;
int InternalCtx;
+ spinlock_t initializing_hba_lock;
+ int initializing_hba_lock_flag;
struct list_head list;
struct net_device *netdev;
struct list_head sas_topology;
@@ -1001,6 +1003,7 @@ extern void mpt_free_fw_memory(MPT_ADAPTER *ioc);
extern int mpt_findImVolumes(MPT_ADAPTER *ioc);
extern int mpt_read_ioc_pg_3(MPT_ADAPTER *ioc);
extern int mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode);
+extern int mpt_alt_ioc_wait(MPT_ADAPTER *ioc);
/*
* Public data decl's...