mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 19:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2020-01-27 20:23:12 -08:00
parent 54b2ed5965 a709260f2e
commit 47a8b4d2e8
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qla2x00t-32gbit/qla_mr.c
View File

@@ -788,8 +788,7 @@ qlafx00_iospace_config(struct qla_hw_data *ha)
goto iospace_error_exit;
}
ha->cregbase =
ioremap_nocache(pci_resource_start(ha->pdev, 0), BAR0_LEN_FX00);
ha->cregbase = ioremap(pci_resource_start(ha->pdev, 0), BAR0_LEN_FX00);
if (!ha->cregbase) {
ql_log_pci(ql_log_fatal, ha->pdev, 0x0128,
"cannot remap MMIO (%s), aborting\n", pci_name(ha->pdev));
@@ -809,8 +808,7 @@ qlafx00_iospace_config(struct qla_hw_data *ha)
goto iospace_error_exit;
}
ha->iobase =
ioremap_nocache(pci_resource_start(ha->pdev, 2), BAR2_LEN_FX00);
ha->iobase = ioremap(pci_resource_start(ha->pdev, 2), BAR2_LEN_FX00);
if (!ha->iobase) {
ql_log_pci(ql_log_fatal, ha->pdev, 0x012b,
"cannot remap MMIO (%s), aborting\n", pci_name(ha->pdev));

11
scst/kernel/in-tree/Makefile.drivers.Linux-5.5.patch Normal file
View 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/