Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[safe/jmp/linux-2.6] / drivers / message / fusion / mptbase.h

diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index a564ae3..bac8eb4 100644 (file)
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -1009,8 +1009,10 @@ extern int        mpt_alt_ioc_wait(MPT_ADAPTER *ioc);
  *  Public data decl's...
  */
 extern struct list_head          ioc_list;
+extern struct proc_dir_entry   *mpt_proc_root_dir;
 
 extern int               mpt_lan_index;        /* needed by mptlan.c */
+extern int               mpt_stm_index;        /* needed by mptstm.c */
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 #endif         /* } __KERNEL__ */