diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 03:49:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 03:49:55 -0800 |
| commit | 467388f29fc9cebfb70e7a187107b6b5d772cb44 (patch) | |
| tree | 4e6fffa65f38addffc149a5fe88be3d2161eaf6e /drivers/net | |
| parent | 028e1415a78733fcd2cba4b4c001826cc37a373e (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
| download | kernel-crypto-467388f29fc9cebfb70e7a187107b6b5d772cb44.tar.gz kernel-crypto-467388f29fc9cebfb70e7a187107b6b5d772cb44.tar.xz kernel-crypto-467388f29fc9cebfb70e7a187107b6b5d772cb44.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/arm/etherh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c index d15d8b79d8e..54b52e5b182 100644 --- a/drivers/net/arm/etherh.c +++ b/drivers/net/arm/etherh.c @@ -646,7 +646,7 @@ static const struct net_device_ops etherh_netdev_ops = { .ndo_get_stats = ei_get_stats, .ndo_set_multicast_list = ei_set_multicast_list, .ndo_validate_addr = eth_validate_addr, - .ndo_set_mac_address = eth_set_mac_addr, + .ndo_set_mac_address = eth_mac_addr, .ndo_change_mtu = eth_change_mtu, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = ei_poll, |