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/atheros | |
| 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/atheros')
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 8892e2b64498..55a2e3795055 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c | |||
| @@ -2685,7 +2685,7 @@ static void atl1c_io_resume(struct pci_dev *pdev) | |||
| 2685 | netif_device_attach(netdev); | 2685 | netif_device_attach(netdev); |
| 2686 | } | 2686 | } |
| 2687 | 2687 | ||
| 2688 | static struct pci_error_handlers atl1c_err_handler = { | 2688 | static const struct pci_error_handlers atl1c_err_handler = { |
| 2689 | .error_detected = atl1c_io_error_detected, | 2689 | .error_detected = atl1c_io_error_detected, |
| 2690 | .slot_reset = atl1c_io_slot_reset, | 2690 | .slot_reset = atl1c_io_slot_reset, |
| 2691 | .resume = atl1c_io_resume, | 2691 | .resume = atl1c_io_resume, |
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c index a98acc8a956f..e213da29e73d 100644 --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c | |||
| @@ -2489,7 +2489,7 @@ static void atl1e_io_resume(struct pci_dev *pdev) | |||
| 2489 | netif_device_attach(netdev); | 2489 | netif_device_attach(netdev); |
| 2490 | } | 2490 | } |
| 2491 | 2491 | ||
| 2492 | static struct pci_error_handlers atl1e_err_handler = { | 2492 | static const struct pci_error_handlers atl1e_err_handler = { |
| 2493 | .error_detected = atl1e_io_error_detected, | 2493 | .error_detected = atl1e_io_error_detected, |
| 2494 | .slot_reset = atl1e_io_slot_reset, | 2494 | .slot_reset = atl1e_io_slot_reset, |
| 2495 | .resume = atl1e_io_resume, | 2495 | .resume = atl1e_io_resume, |