From 08161076f8f770f255400d04b91b48d4c7ca04e1 Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Sat, 20 Feb 2010 20:08:10 +0000
Subject: [PATCH]  - New main Makefile target fcst added  - Preliminary fixes
 to compile on 2.6.33

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1515 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 Makefile                  | 18 ++++++++++++++++++
 mpt/mpt_scst.h            |  4 +++-
 qla_isp/linux/isp_linux.h |  6 +++++-
 scst/include/scst_debug.h |  4 ++++
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 983a061f1..598833574 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@ USR_DIR=usr/fileio
 SRP_DIR=srpt
 SCST_LOCAL_DIR=scst_local
 MVSAS_DIR=mvsas_tgt
+FCST_DIR=fcst
 
 ISCSI_DIR=iscsi-scst
 #ISCSI_DESTDIR=../../../iscsi_scst_inst
@@ -303,6 +304,22 @@ mvsas_clean:
 mvsas_extraclean:
 	cd $(MVSAS_DIR) && $(MAKE) extraclean
 
+fcst:
+	cd $(FCST_DIR) && $(MAKE) all
+
+fcst_install:
+	cd $(FCST_DIR) && $(MAKE) install
+
+fcst_uninstall:
+	cd $(FCST_DIR) && $(MAKE) uninstall
+
+fcst_clean:
+	cd $(FCST_DIR) && $(MAKE) clean
+
+fcst_extraclean:
+	cd $(FCST_DIR) && $(MAKE) extraclean
+
+
 debug2perf:
 	cd $(SCST_DIR) && $(MAKE) $@
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
@@ -372,5 +389,6 @@ disable_proc:
 	usr usr_install usr_uninstall usr_clean usr_extraclean \
 	scst_local scst_local_install scst_local_uninstall scst_local_clean scst_local_extraclean \
 	mvsas mvsas_install mvsas_uninstall mvsas_clean mvsas_extraclean \
+	fcst fcst_install fcst_uninstall fcst_clean fcst_extraclean \
 	debug2perf, debug2release, perf2debug, release2debug \
 	enable_proc disable_proc
diff --git a/mpt/mpt_scst.h b/mpt/mpt_scst.h
index 60845d66e..47acc4f97 100644
--- a/mpt/mpt_scst.h
+++ b/mpt/mpt_scst.h
@@ -4,8 +4,10 @@
 #if defined(MODULE) && !defined(__GENKSYMS__)
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
 #include <linux/config.h>
-#else
+#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 32)
 #include <linux/autoconf.h>
+#else
+#include <generated/autoconf.h>
 #endif
 #include <linux/module.h>
 #endif
diff --git a/qla_isp/linux/isp_linux.h b/qla_isp/linux/isp_linux.h
index d77ace0cf..3a10e2588 100644
--- a/qla_isp/linux/isp_linux.h
+++ b/qla_isp/linux/isp_linux.h
@@ -79,13 +79,17 @@
 #define UNUSED_PARAMETER(x) (void) x
 #endif
 
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 32)
 #include <linux/autoconf.h>
+#else
+#include <generated/autoconf.h>
+#endif
+
 #ifdef  CONFIG_SMP
 #define __SMP__ 1
 #endif
 
 #include <linux/module.h>
-#include <linux/autoconf.h>
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/blkdev.h>
diff --git a/scst/include/scst_debug.h b/scst/include/scst_debug.h
index a20611413..199a1cddb 100644
--- a/scst/include/scst_debug.h
+++ b/scst/include/scst_debug.h
@@ -21,7 +21,11 @@
 #ifndef __SCST_DEBUG_H
 #define __SCST_DEBUG_H
 
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 32)
 #include <linux/autoconf.h>	/* for CONFIG_* */
+#else
+#include <generated/autoconf.h>	/* for CONFIG_* */
+#endif
 
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 19)
 #include <linux/bug.h>		/* for WARN_ON_ONCE */