cciss: only enable cciss_allow_hpsa when for ol5

Orabug: 14106006

commit 55cd818 enable cciss_allow_hpsa for both ol5 and ol6, ol6 need not
this feature, so just enable it when for ol5.

Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 9109034aacc75579dd6f8291c4529096100b049f..ff7c4b424d6e9f8cca3f875f8bb332d5417ca117 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -76,11 +76,13 @@ MODULE_PARM_DESC(cciss_simple_mode,
 
 static DEFINE_MUTEX(cciss_mutex);
 static struct proc_dir_entry *proc_cciss;
-static int cciss_allow_hpsa;
+#ifdef CONFIG_UEK5
+static int cciss_allow_hpsa = 0;
 module_param(cciss_allow_hpsa, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(cciss_allow_hpsa,
        "Prevent cciss driver from accessing hardware known to be "
-       " supported by the hpsa driver");
+       " supported by the hpsa driver. Default: 0 - disabled");
+#endif
 
 #include "cciss_cmd.h"
 #include "cciss.h"
@@ -4172,8 +4174,10 @@ static int __devinit cciss_lookup_board_id(struct pci_dev *pdev, u32 *board_id)
 
        for (i = 0; i < ARRAY_SIZE(products); i++) {
                /* Stand aside for hpsa driver on request */
+#ifdef CONFIG_UEK5
                if (cciss_allow_hpsa && products[i].board_id == HPSA_BOUNDARY)
                        return -ENODEV;
+#endif
                if (*board_id == products[i].board_id)
                        return i;
        }