1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index caadc68c3000..a8f617447d22 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -51,6 +51,7 @@
 
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/mutex.h>
 
 #include "lsi/mpi_type.h"
 #include "lsi/mpi.h"            /* Fusion MPI(nterface) basic defs */
@@ -531,7 +532,7 @@ struct inactive_raid_component_info {
 typedef struct _RaidCfgData {
         IOCPage2_t      *pIocPg2;               /* table of Raid Volumes */
         IOCPage3_t      *pIocPg3;               /* table of physical disks */
-        struct semaphore        inactive_list_mutex;
+        struct mutex    inactive_list_mutex;
         struct list_head        inactive_list; /* link list for physical
                                                 disk that belong in
                                                 inactive volumes */
@@ -630,6 +631,7 @@ typedef struct _MPT_ADAPTER
         int                      mtrr_reg;
         struct pci_dev          *pcidev;        /* struct pci_dev pointer */
         int                     bars;           /* bitmask of BAR's that must be configured */
+        int                     msi_enable;
         u8                      __iomem *memmap;        /* mmap address */
         struct Scsi_Host        *sh;            /* Scsi Host pointer */
         SpiCfgData              spi_data;       /* Scsi config. data */
@@ -693,7 +695,6 @@ typedef struct _MPT_ADAPTER
         struct mutex             sas_discovery_mutex;
         u8                       sas_discovery_runtime;
         u8                       sas_discovery_ignore_events;
-        u16                      handle;
         int                      sas_index; /* index refrencing */
         MPT_SAS_MGMT             sas_mgmt;
         struct work_struct       sas_persist_task;