diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-04 23:59:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-04 23:59:54 -0800 |
| commit | 77827a7cf3aa415f8afec6d9d0537dda8de90ef1 (patch) | |
| tree | 503ab81e2b997e3625360b380f1cd18f923a6454 /drivers/net/arm | |
| parent | 9d40bbda599def1e1d155d7f7dca14fe8744bd2b (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
| download | blackbird-op-linux-77827a7cf3aa415f8afec6d9d0537dda8de90ef1.tar.gz blackbird-op-linux-77827a7cf3aa415f8afec6d9d0537dda8de90ef1.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/arm')
| -rw-r--r-- | drivers/net/arm/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/arm/etherh.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile index c69c0cdba4a2..811a3ccd14c1 100644 --- a/drivers/net/arm/Makefile +++ b/drivers/net/arm/Makefile @@ -4,7 +4,7 @@ # obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o -obj-$(CONFIG_ARM_ETHERH) += etherh.o ../8390.o +obj-$(CONFIG_ARM_ETHERH) += etherh.o obj-$(CONFIG_ARM_ETHER3) += ether3.o obj-$(CONFIG_ARM_ETHER1) += ether1.o obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c index 54b52e5b1821..f52f668c49bf 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 }; |
