diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-08-09 16:20:49 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-08-09 16:20:49 -0500 |
| commit | 471417c9cfb4c2574e2c03bf2273fe12f5388a8e (patch) | |
| tree | ac026ba976bc253fc87a5cdec8f33d24d03e1c9c /drivers/net/tg3.c | |
| parent | 20e007b8cc1266ff78810457d6e26c35c6b810ba (diff) | |
| parent | db29e85a7ece62de1899917c1ec0ffe55cf1d3a0 (diff) | |
| download | kernel_goldelico_gta04-471417c9cfb4c2574e2c03bf2273fe12f5388a8e.zip kernel_goldelico_gta04-471417c9cfb4c2574e2c03bf2273fe12f5388a8e.tar.gz kernel_goldelico_gta04-471417c9cfb4c2574e2c03bf2273fe12f5388a8e.tar.bz2 | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 201a550..368b8fb 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -66,8 +66,8 @@ #define DRV_MODULE_NAME "tg3" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "3.34" -#define DRV_MODULE_RELDATE "July 25, 2005" +#define DRV_MODULE_VERSION "3.35" +#define DRV_MODULE_RELDATE "August 6, 2005" #define TG3_DEF_MAC_MODE 0 #define TG3_DEF_RX_MODE 0 @@ -10421,6 +10421,12 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, tg3_init_coal(tp); + /* Now that we have fully setup the chip, save away a snapshot + * of the PCI config space. We need to restore this after + * GRC_MISC_CFG core clock resets and some resume events. + */ + pci_save_state(tp->pdev); + err = register_netdev(dev); if (err) { printk(KERN_ERR PFX "Cannot register net device, " @@ -10430,12 +10436,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, pci_set_drvdata(pdev, dev); - /* Now that we have fully setup the chip, save away a snapshot - * of the PCI config space. We need to restore this after - * GRC_MISC_CFG core clock resets and some resume events. - */ - pci_save_state(tp->pdev); - printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (PCI%s:%s:%s) %sBaseT Ethernet ", dev->name, tp->board_part_number, |