aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/sungem.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-23 13:35:04 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-23 13:35:04 -0700
commit8be7cdccacfbfc707e7370cad9bb168defed636f (patch)
tree8416607b62ec352176c81afd6f4e7b571ceb957f /drivers/net/sungem.c
parentecd4137320b59759bbe57eef89040ee3e5e66039 (diff)
parent61fa9dcf9329cb92c220f7b656410fbe5e72f933 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/ucc_geth.c
Diffstat (limited to 'drivers/net/sungem.c')
-rw-r--r--drivers/net/sungem.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 64dfa7f5f37..c024352c92f 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2998,8 +2998,11 @@ static const struct net_device_ops gem_netdev_ops = {
.ndo_do_ioctl = gem_ioctl,
.ndo_tx_timeout = gem_tx_timeout,
.ndo_change_mtu = gem_change_mtu,
- .ndo_set_mac_address = eth_mac_addr,
.ndo_validate_addr = eth_validate_addr,
+ .ndo_set_mac_address = gem_set_mac_address,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+ .ndo_poll_controller = gem_poll_controller,
+#endif
};
static int __devinit gem_init_one(struct pci_dev *pdev,
@@ -3161,10 +3164,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
dev->watchdog_timeo = 5 * HZ;
dev->irq = pdev->irq;
dev->dma = 0;
- dev->set_mac_address = gem_set_mac_address;
-#ifdef CONFIG_NET_POLL_CONTROLLER
- dev->poll_controller = gem_poll_controller;
-#endif
/* Set that now, in case PM kicks in now */
pci_set_drvdata(pdev, dev);