Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

[linux-2.6-block.git] / drivers / net / e1000e / param.c

diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c
index 0f4077c3d538d70258e90f5029ce87a3ba100420..a150e48a117f2da94ff73727252263672e51bb8f 100644 (file)
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/e1000e/param.c
@@ -286,7 +286,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                }
        }
        { /* Receive Interrupt Delay */
-               struct e1000_option opt = {
+               static struct e1000_option opt = {
                        .type = range_option,
                        .name = "Receive Interrupt Delay",
                        .err  = "using default of "
@@ -386,7 +386,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                }
        }
        { /* Interrupt Mode */
-               struct e1000_option opt = {
+               static struct e1000_option opt = {
                        .type = range_option,
                        .name = "Interrupt Mode",
                        .err  = "defaulting to 2 (MSI-X)",