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).