diff options
Diffstat (limited to 'drivers/net/igb')
-rw-r--r-- | drivers/net/igb/igb_main.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 62b68769058e..7f322115fd1f 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -179,8 +179,6 @@ static struct pci_driver igb_driver = { | |||
179 | .err_handler = &igb_err_handler | 179 | .err_handler = &igb_err_handler |
180 | }; | 180 | }; |
181 | 181 | ||
182 | static int global_quad_port_a; /* global quad port a indication */ | ||
183 | |||
184 | MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>"); | 182 | MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>"); |
185 | MODULE_DESCRIPTION("Intel(R) Gigabit Ethernet Network Driver"); | 183 | MODULE_DESCRIPTION("Intel(R) Gigabit Ethernet Network Driver"); |
186 | MODULE_LICENSE("GPL"); | 184 | MODULE_LICENSE("GPL"); |
@@ -252,12 +250,9 @@ static int __init igb_init_module(void) | |||
252 | 250 | ||
253 | printk(KERN_INFO "%s\n", igb_copyright); | 251 | printk(KERN_INFO "%s\n", igb_copyright); |
254 | 252 | ||
255 | global_quad_port_a = 0; | ||
256 | |||
257 | #ifdef CONFIG_IGB_DCA | 253 | #ifdef CONFIG_IGB_DCA |
258 | dca_register_notify(&dca_notifier); | 254 | dca_register_notify(&dca_notifier); |
259 | #endif | 255 | #endif |
260 | |||
261 | ret = pci_register_driver(&igb_driver); | 256 | ret = pci_register_driver(&igb_driver); |
262 | return ret; | 257 | return ret; |
263 | } | 258 | } |
@@ -1318,10 +1313,11 @@ static int __devinit igb_probe(struct pci_dev *pdev, | |||
1318 | struct net_device *netdev; | 1313 | struct net_device *netdev; |
1319 | struct igb_adapter *adapter; | 1314 | struct igb_adapter *adapter; |
1320 | struct e1000_hw *hw; | 1315 | struct e1000_hw *hw; |
1316 | u16 eeprom_data = 0; | ||
1317 | static int global_quad_port_a; /* global quad port a indication */ | ||
1321 | const struct e1000_info *ei = igb_info_tbl[ent->driver_data]; | 1318 | const struct e1000_info *ei = igb_info_tbl[ent->driver_data]; |
1322 | unsigned long mmio_start, mmio_len; | 1319 | unsigned long mmio_start, mmio_len; |
1323 | int err, pci_using_dac; | 1320 | int err, pci_using_dac; |
1324 | u16 eeprom_data = 0; | ||
1325 | u16 eeprom_apme_mask = IGB_EEPROM_APME; | 1321 | u16 eeprom_apme_mask = IGB_EEPROM_APME; |
1326 | u32 part_num; | 1322 | u32 part_num; |
1327 | 1323 | ||