diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
| commit | 38d5c149cae32d286308f7962e1d561e7939072f (patch) | |
| tree | 25e564ee34a2fe3778379afae39270d1023fe859 /0001-add-pci_hw_vendor_status.patch | |
| parent | f4c3c7a8ab9226af448d66103dfddf387711af9d (diff) | |
| parent | 05706a271a8883a9bf1bc091089a315129f3db00 (diff) | |
| download | kernel-38d5c149cae32d286308f7962e1d561e7939072f.tar.gz kernel-38d5c149cae32d286308f7962e1d561e7939072f.tar.xz kernel-38d5c149cae32d286308f7962e1d561e7939072f.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc31
Diffstat (limited to '0001-add-pci_hw_vendor_status.patch')
| -rw-r--r-- | 0001-add-pci_hw_vendor_status.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-add-pci_hw_vendor_status.patch b/0001-add-pci_hw_vendor_status.patch index 0cc7c54e7..3c4f0b845 100644 --- a/0001-add-pci_hw_vendor_status.patch +++ b/0001-add-pci_hw_vendor_status.patch @@ -77,10 +77,10 @@ index da6510af1221..2ec02cbfda72 100644 struct pci_driver *drv; struct pci_dev *dev; diff --git a/include/linux/pci.h b/include/linux/pci.h -index 83ce1cdf5676..88397dd562d9 100644 +index f020eae17126..f7dc569f150d 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1397,6 +1397,10 @@ int pci_add_dynid(struct pci_driver *drv, +@@ -1406,6 +1406,10 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); |