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/net/ethernet/neterion | |
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/net/ethernet/neterion')
-rw-r--r-- | drivers/net/ethernet/neterion/s2io.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index d958c2299372..de50547c187d 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c | |||
@@ -484,7 +484,7 @@ static DEFINE_PCI_DEVICE_TABLE(s2io_tbl) = { | |||
484 | 484 | ||
485 | MODULE_DEVICE_TABLE(pci, s2io_tbl); | 485 | MODULE_DEVICE_TABLE(pci, s2io_tbl); |
486 | 486 | ||
487 | static struct pci_error_handlers s2io_err_handler = { | 487 | static const struct pci_error_handlers s2io_err_handler = { |
488 | .error_detected = s2io_io_error_detected, | 488 | .error_detected = s2io_io_error_detected, |
489 | .slot_reset = s2io_io_slot_reset, | 489 | .slot_reset = s2io_io_slot_reset, |
490 | .resume = s2io_io_resume, | 490 | .resume = s2io_io_resume, |
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index de2190443510..cfa71a30dc8d 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c | |||
@@ -4799,7 +4799,7 @@ static void __devexit vxge_remove(struct pci_dev *pdev) | |||
4799 | __LINE__); | 4799 | __LINE__); |
4800 | } | 4800 | } |
4801 | 4801 | ||
4802 | static struct pci_error_handlers vxge_err_handler = { | 4802 | static const struct pci_error_handlers vxge_err_handler = { |
4803 | .error_detected = vxge_io_error_detected, | 4803 | .error_detected = vxge_io_error_detected, |
4804 | .slot_reset = vxge_io_slot_reset, | 4804 | .slot_reset = vxge_io_slot_reset, |
4805 | .resume = vxge_io_resume, | 4805 | .resume = vxge_io_resume, |