Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/ucc_geth.c

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 64dfa7f5f374..c024352c92fd 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);