Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / ixgb / ixgb_param.c

diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c
index 88a08f05624128fb2ffbd148e9036fd8437e4f63..dd7fbeb1f7d166cbfed28eba77791ff48880b331 100644 (file)
--- a/drivers/net/ixgb/ixgb_param.c
+++ b/drivers/net/ixgb/ixgb_param.c
@@ -191,9 +191,9 @@ struct ixgb_option {
                } r;
                struct {        /* list_option info */
                        int nr;
-                       struct ixgb_opt_list {
+                       const struct ixgb_opt_list {
                                int i;
-                               char *str;
+                               const char *str;
                        } *p;
                } l;
        } arg;
@@ -226,7 +226,7 @@ ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt)
                break;
        case list_option: {
                int i;
-               struct ixgb_opt_list *ent;
+               const struct ixgb_opt_list *ent;
 
                for (i = 0; i < opt->arg.l.nr; i++) {
                        ent = &opt->arg.l.p[i];
@@ -322,14 +322,15 @@ ixgb_check_options(struct ixgb_adapter *adapter)
        }
        { /* Flow Control */
 
-               struct ixgb_opt_list fc_list[] =
-                       {{ ixgb_fc_none,        "Flow Control Disabled" },
-                        { ixgb_fc_rx_pause,"Flow Control Receive Only" },
-                        { ixgb_fc_tx_pause,"Flow Control Transmit Only" },
-                        { ixgb_fc_full,        "Flow Control Enabled" },
-                        { ixgb_fc_default, "Flow Control Hardware Default" }};
+               static const struct ixgb_opt_list fc_list[] = {
+                      { ixgb_fc_none, "Flow Control Disabled" },
+                      { ixgb_fc_rx_pause, "Flow Control Receive Only" },
+                      { ixgb_fc_tx_pause, "Flow Control Transmit Only" },
+                      { ixgb_fc_full, "Flow Control Enabled" },
+                      { ixgb_fc_default, "Flow Control Hardware Default" }
+               };
 
-               const struct ixgb_option opt = {
+               static const struct ixgb_option opt = {
                        .type = list_option,
                        .name = "Flow Control",
                        .err  = "reading default settings from EEPROM",