Merge branches 'cpus4096', 'x86/cleanups' and 'x86/urgent' into x86/percpu

[linux-2.6-omap-h63xx.git] / drivers / net / hamachi.c

diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 32200227c9236ea22fb791992531353ab0a729c4..7e8b3c59a7d6ca1f2613e2d3028b3f3b18f7d952 100644 (file)
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -576,6 +576,7 @@ static const struct net_device_ops hamachi_netdev_ops = {
        .ndo_set_multicast_list = set_rx_mode,
        .ndo_change_mtu         = eth_change_mtu,
        .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_mac_address    = eth_mac_addr,
        .ndo_tx_timeout         = hamachi_tx_timeout,
        .ndo_do_ioctl           = netdev_ioctl,
 };