mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-23 05:31:28 +00:00
Merge branch 'svn-trunk'
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
KBUILD_EXTRA_SYMBOLS=$(src)/../scst/src/Module.symvers
|
||||
ccflags-y += -I$(src)/../scst/include
|
||||
ccflags-y += -I$(src)/../scst/include $(shell ev=$$(basename $$(pwd)); echo "ev=$$ev" >&2; [ "$${ev/uek}" != "$${ev}" ] && ev=$${ev/*.el/} && echo -DUEK_RELEASE=$${ev/uek.*})
|
||||
|
||||
obj-$(CONFIG_FCST) += fcst.o
|
||||
|
||||
|
||||
@@ -20,8 +20,7 @@
|
||||
#include <linux/types.h>
|
||||
#include <scsi/libfc.h>
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) && \
|
||||
!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 17) && \
|
||||
defined(UEK_KABI_RENAME))
|
||||
(!defined(UEK_RELEASE) || UEK_RELEASE -0 < 8)
|
||||
#include <scsi/fc_encode.h>
|
||||
#else
|
||||
#include <scsi/fc/fc_ms.h>
|
||||
|
||||
@@ -25,8 +25,7 @@
|
||||
#include <linux/types.h>
|
||||
#include <scsi/libfc.h>
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) && \
|
||||
!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 17) && \
|
||||
defined(UEK_KABI_RENAME))
|
||||
(!defined(UEK_RELEASE) || UEK_RELEASE -0 < 8)
|
||||
#include <scsi/fc_encode.h>
|
||||
#else
|
||||
#include <scsi/fc/fc_ms.h>
|
||||
|
||||
Reference in New Issue
Block a user