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/chelsio/cxgb4 | |
| 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/chelsio/cxgb4')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 4a20821511e7..933985420acb 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | |||
| @@ -3453,7 +3453,7 @@ static void eeh_resume(struct pci_dev *pdev) | |||
| 3453 | rtnl_unlock(); | 3453 | rtnl_unlock(); |
| 3454 | } | 3454 | } |
| 3455 | 3455 | ||
| 3456 | static struct pci_error_handlers cxgb4_eeh = { | 3456 | static const struct pci_error_handlers cxgb4_eeh = { |
| 3457 | .error_detected = eeh_err_detected, | 3457 | .error_detected = eeh_err_detected, |
| 3458 | .slot_reset = eeh_slot_reset, | 3458 | .slot_reset = eeh_slot_reset, |
| 3459 | .resume = eeh_resume, | 3459 | .resume = eeh_resume, |