Merge r7525 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7777 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-04 17:14:21 +00:00
parent 3a7b21bb7d
commit 658a4ad513
3 changed files with 3 additions and 2 deletions

View File

@@ -10,7 +10,7 @@ SCST user space device handler interface description
<name>Vladislav Bolkhovitin</name>
</author>
<date>Version 3.4.0</date>
<date>Version 3.2.0</date>
<toc>

View File

@@ -30,6 +30,7 @@
#define NEW_LIBFC_API
#endif
<<<<<<< .working
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) || \
defined(CONFIG_SUSE_KERNEL) && \
LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)

View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl
$Version = 'SCST Configurator v3.4.0-pre1';
$Version = 'SCST Configurator v3.3.0-pre1';
# Configures SCST
#