From 5155b4561c9141f8663f2a6105d6538e566f2997 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 17 Nov 2010 19:50:57 +0000 Subject: [PATCH] Merge of the trunk's r2744: Fix compilation if target mode support disabled git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.0.0.x@2745 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla_os.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/qla2x00t/qla_os.c b/qla2x00t/qla_os.c index a9efaa425..4b04792f3 100644 --- a/qla2x00t/qla_os.c +++ b/qla2x00t/qla_os.c @@ -3148,12 +3148,8 @@ static bool __init qla2x00_parse_ini_mode(void) return true; } -#else -static inline bool qla2x00_parse_ini_mode(void) -{ - return true; -} -#endif + +#endif /* CONFIG_SCSI_QLA2XXX_TARGET */ /** * qla2x00_module_init - Module initialization. @@ -3182,10 +3178,12 @@ qla2x00_module_init(void) ql2xextended_error_logging = 1; #endif +#ifdef CONFIG_SCSI_QLA2XXX_TARGET if (!qla2x00_parse_ini_mode()) { printk("Wrong qlini_mode value %s\n", qlini_mode); return -EINVAL; } +#endif /* Allocate cache for SRBs. */ srb_cachep = kmem_cache_create("qla2xxx_srbs", sizeof(srb_t), 0,