diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-14 13:59:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-14 13:59:04 +0200 |
| commit | 5a7f345ba5e849229317f73497a17637c9a08e4a (patch) | |
| tree | 4d7661b70e4da95d2acfddce1ba76b7b3190cd3f /pci_groups.patch | |
| parent | 1670862cd60c9110a93d8fdd186d4bfe51b185d1 (diff) | |
| download | patches-5a7f345ba5e849229317f73497a17637c9a08e4a.tar.gz | |
get a bunch of stuff finally upstream.
Diffstat (limited to 'pci_groups.patch')
| -rw-r--r-- | pci_groups.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pci_groups.patch b/pci_groups.patch index a9bd7d50871427..856a9d26b29bad 100644 --- a/pci_groups.patch +++ b/pci_groups.patch @@ -111,7 +111,7 @@ } --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c -@@ -1299,6 +1299,7 @@ int __pci_register_driver(struct pci_dri +@@ -1305,6 +1305,7 @@ int __pci_register_driver(struct pci_dri drv->driver.bus = &pci_bus_type; drv->driver.owner = owner; drv->driver.mod_name = mod_name; @@ -121,7 +121,7 @@ INIT_LIST_HEAD(&drv->dynids.list); --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -716,6 +716,7 @@ struct pci_driver { +@@ -729,6 +729,7 @@ struct pci_driver { void (*shutdown) (struct pci_dev *dev); int (*sriov_configure) (struct pci_dev *dev, int num_vfs); /* PF pdev */ const struct pci_error_handlers *err_handler; |