mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-19 19:51:27 +00:00
Merge branch 'svn-trunk'
This commit is contained in:
@@ -148,7 +148,7 @@ function evaluate(stmnt, pattern, arg, op, result) {
|
||||
gsub("defined\\(HAVE_IB_DMA_MAP_OPS\\)",
|
||||
"(LINUX_VERSION_CODE >= KERNEL_VERSION(0, 0, 0))", stmnt)
|
||||
|
||||
gsub("defined\\(HAVE_IB_SG_DMA_LEN\\)",
|
||||
gsub("HAVE_IB_SG_DMA_LEN",
|
||||
"(LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0))", stmnt)
|
||||
|
||||
gsub("defined(ENABLE_NPIV)", 0, stmnt)
|
||||
|
||||
11
scst/kernel/in-tree/Makefile.drivers.Linux-5.4.patch
Normal file
11
scst/kernel/in-tree/Makefile.drivers.Linux-5.4.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
diff -Naur linux-5.4.6.orig/drivers/Makefile linux-5.4.6/drivers/Makefile
|
||||
--- linux-5.4.6.orig/drivers/Makefile 2019-12-21 11:05:23.000000000 +0100
|
||||
+++ linux-5.4.6/drivers/Makefile 2019-12-22 17:57:42.265448215 +0100
|
||||
@@ -146,6 +146,7 @@
|
||||
obj-$(CONFIG_VHOST_RING) += vhost/
|
||||
obj-$(CONFIG_VHOST) += vhost/
|
||||
obj-$(CONFIG_VLYNQ) += vlynq/
|
||||
+obj-$(CONFIG_SCST) += scst/
|
||||
obj-$(CONFIG_GREYBUS) += greybus/
|
||||
obj-$(CONFIG_STAGING) += staging/
|
||||
obj-y += platform/
|
||||
Reference in New Issue
Block a user