diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-12 23:54:10 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-12 23:54:10 +0400 |
| commit | 1959ec5f82acbdf91425b41600f119ebecb5f6a8 (patch) | |
| tree | b54bc758f10632e991a3a80a94b05f3940b6651c /include | |
| parent | a63ab613ff48c593f4e9ace2d111978e35a202e4 (diff) | |
| parent | 1d3520357df99baf4ad89f86268ac96cd38092d9 (diff) | |
| download | linux-1959ec5f82acbdf91425b41600f119ebecb5f6a8.tar.xz | |
Merge branch 'pci/stephen-const' into next
* pci/stephen-const:
make drivers with pci error handlers const
scsi: make pci error handlers const
netdev: make pci_error_handlers const
PCI: Make pci_error_handlers const
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 2 | ||||
| -rw-r--r-- | include/linux/pcieport_if.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index e52f16189cda..f3b074eb117c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -595,7 +595,7 @@ struct pci_driver { int (*resume_early) (struct pci_dev *dev); int (*resume) (struct pci_dev *dev); /* Device woken up */ void (*shutdown) (struct pci_dev *dev); - struct pci_error_handlers *err_handler; + const struct pci_error_handlers *err_handler; struct device_driver driver; struct pci_dynids dynids; }; diff --git a/include/linux/pcieport_if.h b/include/linux/pcieport_if.h index 6775532b92a9..e6f91b1406d8 100644 --- a/include/linux/pcieport_if.h +++ b/include/linux/pcieport_if.h @@ -49,7 +49,7 @@ struct pcie_port_service_driver { int (*resume) (struct pcie_device *dev); /* Service Error Recovery Handler */ - struct pci_error_handlers *err_handler; + const struct pci_error_handlers *err_handler; /* Link Reset Capability - AER service driver specific */ pci_ers_result_t (*reset_link) (struct pci_dev *dev); |