From bdbcebf0ec5ecb19a44669fc62c1dc8091e0ea4b Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 15 Dec 2011 10:39:40 +0000
Subject: [PATCH] Only include <linux/version.h> if necessary (merge r3517 from
 trunk)

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.0.x@3992 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 fcst/fcst.h          | 2 +-
 scst/include/scst.h  | 2 ++
 scst/src/scst_pres.c | 2 ++
 srpt/src/ib_srpt.h   | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fcst/fcst.h b/fcst/fcst.h
index 5a98ca7cb..57b972c81 100644
--- a/fcst/fcst.h
+++ b/fcst/fcst.h
@@ -19,10 +19,10 @@
 #ifndef __SCSI_FCST_H__
 #define __SCSI_FCST_H__
 
-#include <linux/version.h>
 #ifdef INSIDE_KERNEL_TREE
 #include <scst/scst.h>
 #else
+#include <linux/version.h>
 #include "scst.h"
 #endif
 
diff --git a/scst/include/scst.h b/scst/include/scst.h
index 7fbf17cb1..d376c4383 100644
--- a/scst/include/scst.h
+++ b/scst/include/scst.h
@@ -24,7 +24,9 @@
 #define __SCST_H
 
 #include <linux/types.h>
+#ifndef INSIDE_KERNEL_TREE
 #include <linux/version.h>
+#endif
 #include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/wait.h>
diff --git a/scst/src/scst_pres.c b/scst/src/scst_pres.c
index c5d63a43f..7c1f73533 100644
--- a/scst/src/scst_pres.c
+++ b/scst/src/scst_pres.c
@@ -40,7 +40,9 @@
 #include <linux/fcntl.h>
 #include <linux/uaccess.h>
 #include <linux/namei.h>
+#ifndef INSIDE_KERNEL_TREE
 #include <linux/version.h>
+#endif
 #include <linux/vmalloc.h>
 #include <asm/unaligned.h>
 
diff --git a/srpt/src/ib_srpt.h b/srpt/src/ib_srpt.h
index fe08a174e..69581c801 100644
--- a/srpt/src/ib_srpt.h
+++ b/srpt/src/ib_srpt.h
@@ -35,7 +35,6 @@
 #ifndef IB_SRPT_H
 #define IB_SRPT_H
 
-#include <linux/version.h>
 #include <linux/types.h>
 #include <linux/list.h>
 
@@ -48,6 +47,7 @@
 #if defined(INSIDE_KERNEL_TREE)
 #include <scst/scst.h>
 #else
+#include <linux/version.h>
 #include <scst.h>
 #endif