Merge commit 'v3.6-rc5' into next

[~andy/linux] / drivers / net / ethernet / emulex / benet / be_main.c

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 78b8aa8069f03c440ea6037f9dc3e86e81c62fe6..95d10472f236c2b98f6a107cb0b7ddb0e4b975d4 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -4106,7 +4106,7 @@ err:
        dev_err(&adapter->pdev->dev, "EEH resume failed\n");
 }
 
-static struct pci_error_handlers be_eeh_handlers = {
+static const struct pci_error_handlers be_eeh_handlers = {
        .error_detected = be_eeh_err_detected,
        .slot_reset = be_eeh_reset,
        .resume = be_eeh_resume,