diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
| commit | 7b32641801900ee7e32065b436d7318c5d7a972e (patch) | |
| tree | 7e1f1ffca46787c5ba55af0a2fc9767f9c6e5594 /0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch | |
| parent | 506260a3258dfcbd81c9c8b2f051b9c515ad6071 (diff) | |
| parent | 61b5e2fd06a4be7134afb1cd363002e015123f7f (diff) | |
| download | kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.gz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.xz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.zip | |
merge originkernel-5.8.0-0.rc3.1.vanilla.1.fc33kernel-5.8.0-0.rc3.1.vanilla.1.fc32kernel-5.8.0-0.rc3.1.vanilla.1.fc31
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 | 6 |
1 files changed, 3 insertions, 3 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 abddb7742..224d69801 100644 --- a/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch +++ b/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch @@ -34,7 +34,7 @@ index 81d0414e2117..a3c5be79a9cc 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 81d0414e2117..a3c5be79a9cc 100644 +#endif {0,} }; - + -- -2.26.2 +2.25.4 |