diff --git a/qla2x00t-32gbit/qla_mr.c b/qla2x00t-32gbit/qla_mr.c
index 8078f1525..5e61f20d4 100644
--- a/qla2x00t-32gbit/qla_mr.c
+++ b/qla2x00t-32gbit/qla_mr.c
@@ -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));
diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-5.5.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-5.5.patch
new file mode 100644
index 000000000..26831e87c
--- /dev/null
+++ b/scst/kernel/in-tree/Makefile.drivers.Linux-5.5.patch
@@ -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/