e1000e: add missing initializers reported when compiling with W=1

warning: missing initializer

(cherry picked from commit f36bb6cacd3bcbab9605e06f585ee8f1ea450876)
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index e3bea4181f067a6c29bf418e33bc9bc691838693..c4b1b98c42ba8c36c20f4f90d18ec2d5c9fa48a8 100644 (file)
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -137,7 +137,7 @@ static const struct e1000_reg_info e1000_reg_info_tbl[] = {
        {E1000_TDFPC, "TDFPC"},
 
        /* List Terminator */
-       {}
+       {0, NULL}
 };
 
 /*
@@ -6490,7 +6490,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_LM), board_pch2lan },
        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_V), board_pch2lan },
 
-       { }     /* terminate list */
+       { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
 
@@ -6509,7 +6509,9 @@ static struct pci_driver e1000_driver = {
        .probe    = e1000_probe,
        .remove   = __devexit_p(e1000_remove),
 #ifdef CONFIG_PM
-       .driver.pm = &e1000_pm_ops,
+       .driver   = {
+               .pm = &e1000_pm_ops,
+       },
 #endif
        .shutdown = e1000_shutdown,
        .err_handler = &e1000_err_handler