diff options
| author | Bjorn Helgaas | 2012-09-12 21:54:10 +0200 |
|---|---|---|
| committer | Bjorn Helgaas | 2012-09-12 21:54:10 +0200 |
| commit | 1959ec5f82acbdf91425b41600f119ebecb5f6a8 (patch) | |
| tree | b54bc758f10632e991a3a80a94b05f3940b6651c /drivers/net/ethernet/intel/igb | |
| parent | Merge branch 'pci/gavin-window-alignment' into next (diff) | |
| parent | make drivers with pci error handlers const (diff) | |
| download | kernel-qcow2-linux-1959ec5f82acbdf91425b41600f119ebecb5f6a8.tar.gz kernel-qcow2-linux-1959ec5f82acbdf91425b41600f119ebecb5f6a8.tar.xz kernel-qcow2-linux-1959ec5f82acbdf91425b41600f119ebecb5f6a8.zip | |
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/intel/igb')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 9a379d9c07fa..083ca330a336 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -217,7 +217,7 @@ static pci_ers_result_t igb_io_error_detected(struct pci_dev *, static pci_ers_result_t igb_io_slot_reset(struct pci_dev *); static void igb_io_resume(struct pci_dev *); -static struct pci_error_handlers igb_err_handler = { +static const struct pci_error_handlers igb_err_handler = { .error_detected = igb_io_error_detected, .slot_reset = igb_io_slot_reset, .resume = igb_io_resume, |