diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
commit | f7ba01a9677fffa21535bc6cdcad930a858d6106 (patch) | |
tree | 6eb6df39221f8926b813d63b41ffed9da18e6a5d /0001-megaraid_sas-remove-deprecated-pci-ids.patch | |
parent | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (diff) | |
parent | 6c2cc50051831fa502a8b082a312ca90e7039f3f (diff) | |
download | kernel-5.7.0-0.rc3.1.vanilla.1.fc32.tar.gz kernel-5.7.0-0.rc3.1.vanilla.1.fc32.tar.xz kernel-5.7.0-0.rc3.1.vanilla.1.fc32.zip |
merge masterkernel-5.7.0-0.rc3.1.vanilla.1.fc33kernel-5.7.0-0.rc3.1.vanilla.1.fc32kernel-5.7.0-0.rc3.1.vanilla.1.fc31kernel-5.7.0-0.rc3.1.vanilla.1.fc30
Diffstat (limited to '0001-megaraid_sas-remove-deprecated-pci-ids.patch')
-rw-r--r-- | 0001-megaraid_sas-remove-deprecated-pci-ids.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-megaraid_sas-remove-deprecated-pci-ids.patch b/0001-megaraid_sas-remove-deprecated-pci-ids.patch index eec133f0a..cce969ea9 100644 --- a/0001-megaraid_sas-remove-deprecated-pci-ids.patch +++ b/0001-megaraid_sas-remove-deprecated-pci-ids.patch @@ -1,4 +1,4 @@ -From efa70639e722576719dfa980da086ab20ba8a3b7 Mon Sep 17 00:00:00 2001 +From 163801c9234a71291913de5edb9989ced25e85e0 Mon Sep 17 00:00:00 2001 From: Tomas Henzl <thenzl@redhat.com> Date: Thu, 2 Jan 2020 14:24:37 -0500 Subject: [PATCH] megaraid_sas: remove deprecated pci-ids @@ -29,7 +29,7 @@ index babe85d7b537..9b4df28defd2 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 babe85d7b537..9b4df28defd2 100644 /* Fusion */ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)}, -- -2.26.0 +2.26.2 |