Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2017-09-01 07:19:45 -07:00
14 changed files with 15 additions and 14 deletions
+2 -2
View File
@@ -44,13 +44,13 @@
* and FIO_REV in usr/fileio/common.h as well.
*/
#define SCST_VERSION(a, b, c, d) (((a) << 24) + ((b) << 16) + ((c) << 8) + d)
#define SCST_VERSION_CODE SCST_VERSION(3, 1, 0, 0)
#define SCST_VERSION_CODE SCST_VERSION(3, 4, 0, 0)
#ifdef CONFIG_SCST_PROC
#define SCST_VERSION_STRING_SUFFIX "-procfs"
#else
#define SCST_VERSION_STRING_SUFFIX
#endif
#define SCST_VERSION_NAME "3.3.0-pre1"
#define SCST_VERSION_NAME "3.4.0-pre1"
#define SCST_VERSION_STRING SCST_VERSION_NAME SCST_VERSION_STRING_SUFFIX
#define SCST_CONST_VERSION SCST_CONST_INTF_VER