From 8bc3b3e1868843f2e5a9f4e735efe6f0e3ec5e39 Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Fri, 9 Mar 2012 23:24:34 +0100 Subject: [PATCH] --- yaml --- r: 300532 b: refs/heads/master c: 4ee39fd1a97115f537664cf18dc85bda916c24e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sun/sungem.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cbbb7bb21523..2870a96dd19c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36b7777590be33567be50db7f82282c3237428ad +refs/heads/master: 4ee39fd1a97115f537664cf18dc85bda916c24e5 diff --git a/trunk/drivers/net/ethernet/sun/sungem.c b/trunk/drivers/net/ethernet/sun/sungem.c index ba041596e046..8707d59ed545 100644 --- a/trunk/drivers/net/ethernet/sun/sungem.c +++ b/trunk/drivers/net/ethernet/sun/sungem.c @@ -2899,7 +2899,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev, } gp->pdev = pdev; - dev->base_addr = (long) pdev; gp->dev = dev; gp->msg_enable = DEFAULT_MSG; @@ -2973,7 +2972,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev, netif_napi_add(dev, &gp->napi, gem_poll, 64); dev->ethtool_ops = &gem_ethtool_ops; dev->watchdog_timeo = 5 * HZ; - dev->irq = pdev->irq; dev->dma = 0; /* Set that now, in case PM kicks in now */