Merge branch 'for-linus' of git://neil.brown.name/md

[~andy/linux] / drivers / net / tokenring / tms380tr.c

diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index 793020347e543524708512d5ad0e0681ba0ad1fd..65e9cf3a71febcd3049a8e9c3df771f6b1f13940 100644 (file)
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -2289,7 +2289,7 @@ const struct net_device_ops tms380tr_netdev_ops = {
        .ndo_start_xmit         = tms380tr_send_packet,
        .ndo_tx_timeout         = tms380tr_timeout,
        .ndo_get_stats          = tms380tr_get_stats,
-       .ndo_set_multicast_list = tms380tr_set_multicast_list,
+       .ndo_set_rx_mode        = tms380tr_set_multicast_list,
        .ndo_set_mac_address    = tms380tr_set_mac_address,
 };
 EXPORT_SYMBOL(tms380tr_netdev_ops);