3 files changed, 10 insertions, 10 deletions

diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h
index 11fc17f218c8..6945ff4d382e 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@ -68,11 +68,11 @@
 #define MPT2SAS_DRIVER_NAME             "mpt2sas"
 #define MPT2SAS_AUTHOR  "LSI Corporation <DL-MPTFusionLinux@lsi.com>"
 #define MPT2SAS_DESCRIPTION     "LSI MPT Fusion SAS 2.0 Device Driver"
-#define MPT2SAS_DRIVER_VERSION          "00.100.11.15"
+#define MPT2SAS_DRIVER_VERSION          "00.100.11.16"
 #define MPT2SAS_MAJOR_VERSION           00
 #define MPT2SAS_MINOR_VERSION           100
 #define MPT2SAS_BUILD_VERSION           11
-#define MPT2SAS_RELEASE_VERSION         15
+#define MPT2SAS_RELEASE_VERSION         16
 
 /*
  * Set MPT2SAS_SG_DEPTH value based on user input.
@@ -647,7 +647,7 @@ typedef void (*MPT_CALLBACK)(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 VF_ID,
 
 
 /* base shared API */
-extern struct list_head ioc_list;
+extern struct list_head mpt2sas_ioc_list;
 
 int mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc);
 void mpt2sas_base_detach(struct MPT2SAS_ADAPTER *ioc);
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index 4fbe3f83319b..2d4f85c9d7a1 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -355,7 +355,7 @@ _ctl_verify_adapter(int ioc_number, struct MPT2SAS_ADAPTER **iocpp)
 {
         struct MPT2SAS_ADAPTER *ioc;
 
-        list_for_each_entry(ioc, &ioc_list, list) {
+        list_for_each_entry(ioc, &mpt2sas_ioc_list, list) {
                 if (ioc->id != ioc_number)
                         continue;
                 *iocpp = ioc;
@@ -439,7 +439,7 @@ _ctl_poll(struct file *filep, poll_table *wait)
 
         poll_wait(filep, &ctl_poll_wait, wait);
 
-        list_for_each_entry(ioc, &ioc_list, list) {
+        list_for_each_entry(ioc, &mpt2sas_ioc_list, list) {
                 if (ioc->aen_event_read_flag)
                         return POLLIN | POLLRDNORM;
         }
@@ -2497,7 +2497,7 @@ mpt2sas_ctl_exit(void)
         struct MPT2SAS_ADAPTER *ioc;
         int i;
 
-        list_for_each_entry(ioc, &ioc_list, list) {
+        list_for_each_entry(ioc, &mpt2sas_ioc_list, list) {
 
                 /* free memory associated to diag buffers */
                 for (i = 0; i < MPI2_DIAG_BUF_TYPE_COUNT; i++) {
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 50865a8e1a4f..0c463c483c02 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -68,10 +68,9 @@ static void _scsih_expander_node_remove(struct MPT2SAS_ADAPTER *ioc,
 static void _firmware_event_work(struct work_struct *work);
 
 /* global parameters */
-LIST_HEAD(ioc_list);
+LIST_HEAD(mpt2sas_ioc_list);
 
 /* local parameters */
-static u32 logging_level;
 static u8 scsi_io_cb_idx = -1;
 static u8 tm_cb_idx = -1;
 static u8 ctl_cb_idx = -1;
@@ -81,6 +80,7 @@ static u8 config_cb_idx = -1;
 static int mpt_ids;
 
 /* command line options */
+static u32 logging_level;
 MODULE_PARM_DESC(logging_level, " bits for enabling additional logging info "
     "(default=0)");
 
@@ -211,7 +211,7 @@ scsih_set_debug_level(const char *val, struct kernel_param *kp)
                 return ret;
 
         printk(KERN_INFO "setting logging_level(0x%08x)\n", logging_level);
-        list_for_each_entry(ioc, &ioc_list, list)
+        list_for_each_entry(ioc, &mpt2sas_ioc_list, list)
                 ioc->logging_level = logging_level;
         return 0;
 }
@@ -5464,7 +5464,7 @@ scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         ioc = shost_priv(shost);
         memset(ioc, 0, sizeof(struct MPT2SAS_ADAPTER));
         INIT_LIST_HEAD(&ioc->list);
-        list_add_tail(&ioc->list, &ioc_list);
+        list_add_tail(&ioc->list, &mpt2sas_ioc_list);
         ioc->shost = shost;
         ioc->id = mpt_ids++;
         sprintf(ioc->name, "%s%d", MPT2SAS_DRIVER_NAME, ioc->id);