diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-12 13:54:10 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-12 13:54:10 -0600 |
| commit | 1959ec5f82acbdf91425b41600f119ebecb5f6a8 (patch) | |
| tree | b54bc758f10632e991a3a80a94b05f3940b6651c /drivers/net/ethernet/broadcom/bnx2.c | |
| 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/broadcom/bnx2.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index 79cebd8525ce..a0e8399793b6 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -8742,7 +8742,7 @@ static void bnx2_io_resume(struct pci_dev *pdev) rtnl_unlock(); } -static struct pci_error_handlers bnx2_err_handler = { +static const struct pci_error_handlers bnx2_err_handler = { .error_detected = bnx2_io_error_detected, .slot_reset = bnx2_io_slot_reset, .resume = bnx2_io_resume, |