diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
commit | 168917328214e94a54dbd4ef227dab46029b8134 (patch) | |
tree | 9f5fbf0580f00cf39b1b0cfe1dacc387499e999f /0001-add-pci_hw_vendor_status.patch | |
parent | 38d5c149cae32d286308f7962e1d561e7939072f (diff) | |
parent | 8ae1eddbf56e902877016abbadb2150afe87711c (diff) | |
download | kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.gz kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.xz kernel-168917328214e94a54dbd4ef227dab46029b8134.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc31
Diffstat (limited to '0001-add-pci_hw_vendor_status.patch')
-rw-r--r-- | 0001-add-pci_hw_vendor_status.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-add-pci_hw_vendor_status.patch b/0001-add-pci_hw_vendor_status.patch index 3c4f0b845..42a34ff20 100644 --- a/0001-add-pci_hw_vendor_status.patch +++ b/0001-add-pci_hw_vendor_status.patch @@ -77,7 +77,7 @@ 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 f020eae17126..f7dc569f150d 100644 +index c79d83304e52..695efeea48f0 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1406,6 +1406,10 @@ int pci_add_dynid(struct pci_driver *drv, |