From 6e35445b98981b1ad317d4956df291f137f8775d Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Fri, 24 Sep 2010 19:39:40 +0000
Subject: [PATCH] Moved the UNMAP and BLKDISCARD definitions from scst.h to
 scst_const.h.

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2254 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/include/scst.h       | 16 ----------------
 scst/include/scst_const.h | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/scst/include/scst.h b/scst/include/scst.h
index 0a3cb3c7c..b158338ab 100644
--- a/scst/include/scst.h
+++ b/scst/include/scst.h
@@ -39,22 +39,6 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
-/*
- * From <scsi/scsi.h>. See also commit
- * f57e4502cea471c69782d4790c71d8414ab49a9d.
- */
-#define UNMAP 0x42
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28)
-/*
- * From <linux/fs.h>. See also commit
- * d30a2605be9d5132d95944916e8f578fcfe4f976.
- */
-#define BLKDISCARD _IO(0x12,119)
-#endif
-
 #ifdef INSIDE_KERNEL_TREE
 #include <scst/scst_const.h>
 #else
diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h
index 44ff05dc9..f953fca7a 100644
--- a/scst/include/scst_const.h
+++ b/scst/include/scst_const.h
@@ -276,6 +276,23 @@ enum scst_cdb_flags {
 #endif
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+/*
+ * From <scsi/scsi.h>. See also commit
+ * f57e4502cea471c69782d4790c71d8414ab49a9d.
+ */
+#define UNMAP 0x42
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
+/*
+ * From <linux/fs.h>. See also commit
+ * d30a2605be9d5132d95944916e8f578fcfe4f976.
+ */
+#define BLKDISCARD _IO(0x12,119)
+#endif
+
+
 /*************************************************************
  **  SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
  **  T10/1561-D Revision 4 Draft dated 7th November 2002.