summaryrefslogtreecommitdiffstats
path: root/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-06-30 17:31:55 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-06-30 17:31:55 +0200
commite11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a (patch)
tree724e53ad8d5c0f42dc98ddc9e9ab1f39e1e3c542 /0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch
parent7b32641801900ee7e32065b436d7318c5d7a972e (diff)
parentd176dfce22f5ead7a6018edb69757bc8840cc008 (diff)
downloadkernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.tar.gz
kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.tar.xz
kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.zip
merge origin
Diffstat (limited to '0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch')
-rw-r--r--0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch b/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch
index 0d2aa7608..bd4b53761 100644
--- a/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch
+++ b/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch
@@ -35,7 +35,7 @@ index eabc4de5816c..c028f5944694 100644
+++ b/drivers/message/fusion/mptspi.c
@@ -1534,6 +1534,12 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
0, 0, 0, 0, 5);
-
+
scsi_scan_host(sh);
+
+#ifdef CONFIG_RHEL_DIFFERENCES
@@ -44,8 +44,8 @@ index eabc4de5816c..c028f5944694 100644
+#endif
+
return 0;
-
+
out_mptspi_probe:
--
-2.25.4
+2.26.2