aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/sun/sungem.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index ba041596e046..8707d59ed545 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -2899,7 +2899,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
2899 } 2899 }
2900 2900
2901 gp->pdev = pdev; 2901 gp->pdev = pdev;
2902 dev->base_addr = (long) pdev;
2903 gp->dev = dev; 2902 gp->dev = dev;
2904 2903
2905 gp->msg_enable = DEFAULT_MSG; 2904 gp->msg_enable = DEFAULT_MSG;
@@ -2973,7 +2972,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
2973 netif_napi_add(dev, &gp->napi, gem_poll, 64); 2972 netif_napi_add(dev, &gp->napi, gem_poll, 64);
2974 dev->ethtool_ops = &gem_ethtool_ops; 2973 dev->ethtool_ops = &gem_ethtool_ops;
2975 dev->watchdog_timeo = 5 * HZ; 2974 dev->watchdog_timeo = 5 * HZ;
2976 dev->irq = pdev->irq;
2977 dev->dma = 0; 2975 dev->dma = 0;
2978 2976
2979 /* Set that now, in case PM kicks in now */ 2977 /* Set that now, in case PM kicks in now */