summaryrefslogtreecommitdiffstats
path: root/0001-megaraid_sas-remove-deprecated-pci-ids.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-megaraid_sas-remove-deprecated-pci-ids.patch
parent7b32641801900ee7e32065b436d7318c5d7a972e (diff)
parentd176dfce22f5ead7a6018edb69757bc8840cc008 (diff)
downloadkernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.tar.gz
kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.tar.xz
kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.zip
merge origin
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 25cef811c..b84c1b6ed 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.25.4
+2.26.2