diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-04 19:51:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-04 19:51:58 -0500 |
| commit | 005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5 (patch) | |
| tree | bc3ef1b64dcdb48b2d6accb51951a0d73b33262e /drivers/net/arm | |
| parent | 4d7902f22b0804730b80f7a4147f676430248a3a (diff) | |
| parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/arm')
| -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 d15d8b79d8e5..54b52e5b1821 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 = { | |||
| 646 | .ndo_get_stats = ei_get_stats, | 646 | .ndo_get_stats = ei_get_stats, |
| 647 | .ndo_set_multicast_list = ei_set_multicast_list, | 647 | .ndo_set_multicast_list = ei_set_multicast_list, |
| 648 | .ndo_validate_addr = eth_validate_addr, | 648 | .ndo_validate_addr = eth_validate_addr, |
| 649 | .ndo_set_mac_address = eth_set_mac_addr, | 649 | .ndo_set_mac_address = eth_mac_addr, |
| 650 | .ndo_change_mtu = eth_change_mtu, | 650 | .ndo_change_mtu = eth_change_mtu, |
| 651 | #ifdef CONFIG_NET_POLL_CONTROLLER | 651 | #ifdef CONFIG_NET_POLL_CONTROLLER |
| 652 | .ndo_poll_controller = ei_poll, | 652 | .ndo_poll_controller = ei_poll, |