diff --git a/[refs] b/[refs] index 6fb254505f68..eda91b9e0f12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e12274ba0ca0d9c7e175c419964dbdbe2fd671f8 +refs/heads/master: 72c71f4827d1f724e8d44677367ed8e924e69de9 diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c index e67a130f9e46..5b191afc1442 100644 --- a/trunk/drivers/staging/slicoss/slicoss.c +++ b/trunk/drivers/staging/slicoss/slicoss.c @@ -354,7 +354,6 @@ static const struct net_device_ops slic_netdev_ops = { .ndo_get_stats = slic_get_stats, .ndo_set_multicast_list = slic_mcast_set_list, .ndo_validate_addr = eth_validate_addr, - .ndo_set_mac_address = eth_mac_addr, .ndo_change_mtu = eth_change_mtu, };