e1000e: add missing initializers reported when compiling with W=1
authorBruce Allan <bruce.w.allan@intel.com>
Tue, 31 Jan 2012 06:38:04 +0000 (06:38 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 7 Feb 2012 12:09:14 +0000 (04:09 -0800)
warning: missing initializer

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>
drivers/net/ethernet/intel/e1000e/netdev.c

index 1a8dd2f0e609c63f0ce7fe18611d9afa71d02861..c05137f362a1b974a13524d166dd889c414c23c4 100644 (file)
@@ -137,7 +137,7 @@ static const struct e1000_reg_info e1000_reg_info_tbl[] = {
        {E1000_TDFPC, "TDFPC"},
 
        /* List Terminator */
-       {}
+       {0, NULL}
 };
 
 /*
@@ -6502,7 +6502,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);
 
@@ -6521,7 +6521,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