diff --git a/scst/include/scst.h b/scst/include/scst.h
index 7e853dd64..99a1d2b7b 100644
--- a/scst/include/scst.h
+++ b/scst/include/scst.h
@@ -242,7 +242,8 @@ static inline unsigned int queue_max_hw_sectors(struct request_queue *q)
 #endif
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
+	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 6 && RHEL_MINOR -0 < 1)
 extern int hex_to_bin(char ch);
 #endif
 
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index fdeea4c90..b1be8e17c 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -100,7 +100,8 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
 }
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
+	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 6 && RHEL_MINOR -0 < 1)
 /*
  * See also "lib: introduce common method to convert hex digits" (commit
  * 903788892ea0fc7fcaf7e8e5fac9a77379fc215b).