Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / net / cris / eth_v10.c

diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index e66aceb..7cb2785 100644 (file)
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -261,7 +261,7 @@ static const struct net_device_ops e100_netdev_ops = {
        .ndo_start_xmit         = e100_send_packet,
        .ndo_tx_timeout         = e100_tx_timeout,
        .ndo_get_stats          = e100_get_stats,
-       .ndo_set_multicast_list = set_multicast_list,
+       .ndo_set_rx_mode        = set_multicast_list,
        .ndo_do_ioctl           = e100_ioctl,
        .ndo_set_mac_address    = e100_set_mac_address,
        .ndo_validate_addr      = eth_validate_addr,