Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / drivers / net / ethernet / amd / au1000_eth.c

diff --git a/drivers/net/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
similarity index 99%
rename from drivers/net/au1000_eth.c
rename to drivers/net/ethernet/amd/au1000_eth.c
index 7013afcc13e62d82d0f93e8198d978722d4e9e1a..4865ff14bebf230a9c5a460d2817bd029029493d 100644 (file)
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -1008,7 +1008,7 @@ static const struct net_device_ops au1000_netdev_ops = {
        .ndo_open               = au1000_open,
        .ndo_stop               = au1000_close,
        .ndo_start_xmit         = au1000_tx,
-       .ndo_set_multicast_list = au1000_multicast_list,
+       .ndo_set_rx_mode        = au1000_multicast_list,
        .ndo_do_ioctl           = au1000_ioctl,
        .ndo_tx_timeout         = au1000_tx_timeout,
        .ndo_set_mac_address    = eth_mac_addr,