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/broadcom/tg3.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/tg3.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 8325fd8d4e5b..388d32213937 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
| @@ -16373,7 +16373,7 @@ done: | |||
| 16373 | rtnl_unlock(); | 16373 | rtnl_unlock(); |
| 16374 | } | 16374 | } |
| 16375 | 16375 | ||
| 16376 | static struct pci_error_handlers tg3_err_handler = { | 16376 | static const struct pci_error_handlers tg3_err_handler = { |
| 16377 | .error_detected = tg3_io_error_detected, | 16377 | .error_detected = tg3_io_error_detected, |
| 16378 | .slot_reset = tg3_io_slot_reset, | 16378 | .slot_reset = tg3_io_slot_reset, |
| 16379 | .resume = tg3_io_resume | 16379 | .resume = tg3_io_resume |