diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
| commit | f05c02032c007399078784ea2ace322385f869b9 (patch) | |
| tree | 7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-add-pci_hw_vendor_status.patch | |
| parent | 55576abe986db86a9f4e2b105d2451800d652217 (diff) | |
| parent | f7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff) | |
| download | kernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz kernel-f05c02032c007399078784ea2ace322385f869b9.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to '0001-add-pci_hw_vendor_status.patch')
| -rw-r--r-- | 0001-add-pci_hw_vendor_status.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0001-add-pci_hw_vendor_status.patch b/0001-add-pci_hw_vendor_status.patch index c64ca91f5..d27519548 100644 --- a/0001-add-pci_hw_vendor_status.patch +++ b/0001-add-pci_hw_vendor_status.patch @@ -30,10 +30,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 2 files changed, 33 insertions(+) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index da6510af1221..2ec02cbfda72 100644 +index 449466f71040..f5678ed743bf 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c -@@ -18,6 +18,7 @@ +@@ -19,6 +19,7 @@ #include <linux/kexec.h> #include <linux/of_device.h> #include <linux/acpi.h> @@ -41,7 +41,7 @@ index da6510af1221..2ec02cbfda72 100644 #include "pci.h" #include "pcie/portdrv.h" -@@ -278,6 +279,34 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv, +@@ -279,6 +280,34 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv, return found_id; } @@ -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 34c1c4f45288..6d9a405feea5 100644 +index 835530605c0d..1a5afb3b706f 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1406,6 +1406,10 @@ int pci_add_dynid(struct pci_driver *drv, |