diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-12 15:54:10 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-12 15:54:10 -0400 |
| commit | 1959ec5f82acbdf91425b41600f119ebecb5f6a8 (patch) | |
| tree | b54bc758f10632e991a3a80a94b05f3940b6651c /drivers/xen | |
| parent | a63ab613ff48c593f4e9ace2d111978e35a202e4 (diff) | |
| parent | 1d3520357df99baf4ad89f86268ac96cd38092d9 (diff) | |
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 'drivers/xen')
| -rw-r--r-- | drivers/xen/xen-pciback/pci_stub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c index 097e536e8672..0f1539edbd01 100644 --- a/drivers/xen/xen-pciback/pci_stub.c +++ b/drivers/xen/xen-pciback/pci_stub.c | |||
| @@ -871,7 +871,7 @@ end: | |||
| 871 | } | 871 | } |
| 872 | 872 | ||
| 873 | /*add xen_pcibk AER handling*/ | 873 | /*add xen_pcibk AER handling*/ |
| 874 | static struct pci_error_handlers xen_pcibk_error_handler = { | 874 | static const struct pci_error_handlers xen_pcibk_error_handler = { |
| 875 | .error_detected = xen_pcibk_error_detected, | 875 | .error_detected = xen_pcibk_error_detected, |
| 876 | .mmio_enabled = xen_pcibk_mmio_enabled, | 876 | .mmio_enabled = xen_pcibk_mmio_enabled, |
| 877 | .slot_reset = xen_pcibk_slot_reset, | 877 | .slot_reset = xen_pcibk_slot_reset, |