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-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch | |
| parent | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (diff) | |
| parent | 6c2cc50051831fa502a8b082a312ca90e7039f3f (diff) | |
| download | kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.gz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.xz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.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-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch')
| -rw-r--r-- | 0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch b/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch index ee4292c47..8985eea72 100644 --- a/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch +++ b/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch @@ -1,4 +1,4 @@ -From dd15cdb1c47b059a1656d71597f7aad227c927e2 Mon Sep 17 00:00:00 2001 +From 96f4a765f34522402290941defd0426c280a4a05 Mon Sep 17 00:00:00 2001 From: Joseph Szczypek <jszczype@redhat.com> Date: Thu, 2 Jan 2020 14:24:40 -0500 Subject: [PATCH] hpsa: remove old cciss-based smartarray pci ids @@ -34,7 +34,7 @@ index 1e9302e99d05..b903580d626f 100644 +#ifndef CONFIG_RHEL_DIFFERENCES MODULE_ALIAS("cciss"); +#endif - + static int hpsa_simple_mode; module_param(hpsa_simple_mode, int, S_IRUGO|S_IWUSR); @@ -144,10 +146,12 @@ static const struct pci_device_id hpsa_pci_device_id[] = { @@ -49,7 +49,7 @@ index 1e9302e99d05..b903580d626f 100644 +#endif {0,} }; - + -- -2.26.0 +2.26.2 |