Merge remote-tracking branch 'net/master'

[karo-tx-linux.git] / drivers / net / ethernet / cadence / at91_ether.c

diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
similarity index 99%
rename from drivers/net/arm/at91_ether.c
rename to drivers/net/ethernet/cadence/at91_ether.c
index 48b4ec121f7f74c86342c2897bec326a07cd5a3f..56624d3034871c4988ddd3e4963206133eaab517 100644 (file)
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/ethernet/cadence/at91_ether.c
@@ -968,7 +968,7 @@ static const struct net_device_ops at91ether_netdev_ops = {
        .ndo_stop               = at91ether_close,
        .ndo_start_xmit         = at91ether_start_xmit,
        .ndo_get_stats          = at91ether_stats,
-       .ndo_set_multicast_list = at91ether_set_multicast_list,
+       .ndo_set_rx_mode        = at91ether_set_multicast_list,
        .ndo_set_mac_address    = set_mac_address,
        .ndo_do_ioctl           = at91ether_ioctl,
        .ndo_validate_addr      = eth_validate_addr,