From 3136f99a8692566212f2cc8ee419c63c5358e561 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bart.vanassche@sandisk.com>
Date: Sat, 28 Nov 2015 04:39:57 +0000
Subject: [PATCH] scst-const.h: Follow-up for r6714

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6715 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/include/scst_const.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h
index cd213cbee..caa54728c 100644
--- a/scst/include/scst_const.h
+++ b/scst/include/scst_const.h
@@ -466,7 +466,7 @@ static inline int scst_sense_response_code(const uint8_t *sense)
 #endif
 #endif
 
-#ifndef GENERATING_UPSTREAM_PATCH
+#if !defined(__KERNEL__) || LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
 /*
  * See also patch "scsi: rename SERVICE_ACTION_IN_16 to SERVICE_ACTION_IN_16"
  * (commit eb846d9f147455e4e5e1863bfb5e31974bb69b7c; kernel 3.19.0).