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

[mv-sheeva.git] / drivers / net / e1000 / e1000_param.c

diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index 10d8d98bb797f1c8f6576157ad5d91744403b5a9..1301eba8b57adca90d79ce68ca75d7c81ec05494 100644 (file)
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -352,12 +352,13 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
        }
        { /* Flow Control */
 
-               struct e1000_opt_list fc_list[] =
-                       {{ E1000_FC_NONE,    "Flow Control Disabled" },
-                        { E1000_FC_RX_PAUSE,"Flow Control Receive Only" },
-                        { E1000_FC_TX_PAUSE,"Flow Control Transmit Only" },
-                        { E1000_FC_FULL,    "Flow Control Enabled" },
-                        { E1000_FC_DEFAULT, "Flow Control Hardware Default" }};
+               static const struct e1000_opt_list fc_list[] = {
+                      { E1000_FC_NONE, "Flow Control Disabled" },
+                      { E1000_FC_RX_PAUSE, "Flow Control Receive Only" },
+                      { E1000_FC_TX_PAUSE, "Flow Control Transmit Only" },
+                      { E1000_FC_FULL, "Flow Control Enabled" },
+                      { E1000_FC_DEFAULT, "Flow Control Hardware Default" }
+               };
 
                opt = (struct e1000_option) {
                        .type = list_option,