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-mptsas-pci-id-table-changes.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-mptsas-pci-id-table-changes.patch')
| -rw-r--r-- | 0001-mptsas-pci-id-table-changes.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-mptsas-pci-id-table-changes.patch b/0001-mptsas-pci-id-table-changes.patch index ed02cf9ad..258d25981 100644 --- a/0001-mptsas-pci-id-table-changes.patch +++ b/0001-mptsas-pci-id-table-changes.patch @@ -1,4 +1,4 @@ -From 17b7b240a30ab7342db5e2853d13a41fb88bf2ee Mon Sep 17 00:00:00 2001 +From 8e0c371236b954161a34286a11267e8627cc76a4 Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Thu, 2 Jan 2020 14:24:47 -0500 Subject: [PATCH] mptsas: pci-id table changes @@ -36,7 +36,7 @@ index c17614cd6ed8..ca44a35ec411 100644 +++ b/drivers/message/fusion/mptsas.c @@ -5358,6 +5358,10 @@ static void mptsas_remove(struct pci_dev *pdev) } - + static struct pci_device_id mptsas_pci_table[] = { +#ifdef CONFIG_RHEL_DIFFERENCES + { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068, @@ -54,5 +54,5 @@ index c17614cd6ed8..ca44a35ec411 100644 }; MODULE_DEVICE_TABLE(pci, mptsas_pci_table); -- -2.26.0 +2.26.2 |