summaryrefslogtreecommitdiffstats
path: root/0001-megaraid_sas-remove-deprecated-pci-ids.patch
diff options
context:
space:
mode:
authorAugusto Caringi <acaringi@redhat.com>2020-06-29 15:02:20 -0300
committerAugusto Caringi <acaringi@redhat.com>2020-06-29 15:02:20 -0300
commit9b53592daf7ec9906beefa9e36772dafcf446132 (patch)
treead225c0978d9a8ab32e649eb21b43492525b3c4e /0001-megaraid_sas-remove-deprecated-pci-ids.patch
parenta6d5bdfa755afd46b7cb294d2a32a4f53e79aef3 (diff)
downloadkernel-9b53592daf7ec9906beefa9e36772dafcf446132.tar.gz
kernel-9b53592daf7ec9906beefa9e36772dafcf446132.tar.xz
kernel-9b53592daf7ec9906beefa9e36772dafcf446132.zip
kernel-5.8.0-0.rc3.1
* Mon Jun 29 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc3.1] - v5.8-rc3 rebase - s390x-zfcpdump: Handle missing Module.symvers file (Don Zickus) - Updated changelog for the release based on 8be3a53e18e0 (Fedora Kernel Team) Resolves: rhbz# Signed-off-by: Augusto Caringi <acaringi@redhat.com>
Diffstat (limited to '0001-megaraid_sas-remove-deprecated-pci-ids.patch')
-rw-r--r--0001-megaraid_sas-remove-deprecated-pci-ids.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-megaraid_sas-remove-deprecated-pci-ids.patch b/0001-megaraid_sas-remove-deprecated-pci-ids.patch
index b84c1b6ed..25cef811c 100644
--- a/0001-megaraid_sas-remove-deprecated-pci-ids.patch
+++ b/0001-megaraid_sas-remove-deprecated-pci-ids.patch
@@ -29,7 +29,7 @@ index 00668335c2af..219f95ab56f8 100644
@@ -133,6 +133,7 @@ static void megasas_get_pd_info(struct megasas_instance *instance,
*/
static struct pci_device_id megasas_pci_table[] = {
-
+
+#ifndef CONFIG_RHEL_DIFFERENCES
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)},
/* xscale IOP */
@@ -43,5 +43,5 @@ index 00668335c2af..219f95ab56f8 100644
/* Fusion */
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)},
--
-2.26.2
+2.25.4