diff options
| author | Nicolas Pitre <nico@cam.org> | 2009-03-15 21:41:23 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@cam.org> | 2009-03-15 21:41:23 -0400 |
| commit | d6f818f71fa5db79969aaecba302745199376169 (patch) | |
| tree | fcdedce488db0f80c7a816e0b52df83a01972838 /drivers/net/arm/etherh.c | |
| parent | ace14b82633960a2b6bf6a0b2640c63872a65562 (diff) | |
| parent | 305b07680f6c6a7e59f996c5bd85f009caff5bb1 (diff) | |
Merge commit '305b07680f' into orion/master
Diffstat (limited to 'drivers/net/arm/etherh.c')
| -rw-r--r-- | drivers/net/arm/etherh.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c index 54b52e5b182..f52f668c49b 100644 --- a/drivers/net/arm/etherh.c +++ b/drivers/net/arm/etherh.c @@ -641,15 +641,15 @@ static const struct net_device_ops etherh_netdev_ops = { .ndo_open = etherh_open, .ndo_stop = etherh_close, .ndo_set_config = etherh_set_config, - .ndo_start_xmit = ei_start_xmit, - .ndo_tx_timeout = ei_tx_timeout, - .ndo_get_stats = ei_get_stats, - .ndo_set_multicast_list = ei_set_multicast_list, + .ndo_start_xmit = __ei_start_xmit, + .ndo_tx_timeout = __ei_tx_timeout, + .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_mac_addr, .ndo_change_mtu = eth_change_mtu, #ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = ei_poll, + .ndo_poll_controller = __ei_poll, #endif }; |