diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2012-01-31 01:38:04 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-02-07 07:09:14 -0500 |
commit | f36bb6cacd3bcbab9605e06f585ee8f1ea450876 (patch) | |
tree | 921f54d35eb4e56c91a04a327f3018390bed1cf2 | |
parent | b04e36bac5075ceeacf11b639fbf0cb69aa68996 (diff) |
e1000e: add missing initializers reported when compiling with W=1
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>
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 1a8dd2f0e609..c05137f362a1 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -137,7 +137,7 @@ static const struct e1000_reg_info e1000_reg_info_tbl[] = { | |||
137 | {E1000_TDFPC, "TDFPC"}, | 137 | {E1000_TDFPC, "TDFPC"}, |
138 | 138 | ||
139 | /* List Terminator */ | 139 | /* List Terminator */ |
140 | {} | 140 | {0, NULL} |
141 | }; | 141 | }; |
142 | 142 | ||
143 | /* | 143 | /* |
@@ -6502,7 +6502,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = { | |||
6502 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_LM), board_pch2lan }, | 6502 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_LM), board_pch2lan }, |
6503 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_V), board_pch2lan }, | 6503 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_V), board_pch2lan }, |
6504 | 6504 | ||
6505 | { } /* terminate list */ | 6505 | { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ |
6506 | }; | 6506 | }; |
6507 | MODULE_DEVICE_TABLE(pci, e1000_pci_tbl); | 6507 | MODULE_DEVICE_TABLE(pci, e1000_pci_tbl); |
6508 | 6508 | ||
@@ -6521,7 +6521,9 @@ static struct pci_driver e1000_driver = { | |||
6521 | .probe = e1000_probe, | 6521 | .probe = e1000_probe, |
6522 | .remove = __devexit_p(e1000_remove), | 6522 | .remove = __devexit_p(e1000_remove), |
6523 | #ifdef CONFIG_PM | 6523 | #ifdef CONFIG_PM |
6524 | .driver.pm = &e1000_pm_ops, | 6524 | .driver = { |
6525 | .pm = &e1000_pm_ops, | ||
6526 | }, | ||
6525 | #endif | 6527 | #endif |
6526 | .shutdown = e1000_shutdown, | 6528 | .shutdown = e1000_shutdown, |
6527 | .err_handler = &e1000_err_handler | 6529 | .err_handler = &e1000_err_handler |