提交 6dac62d3 编写于 作者: D David S. Miller

Revert "etherh: Get working again."

This reverts commit 7d3d5ec1.

Russell is going to merge this in via the ARM tree.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 7691367d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o
obj-$(CONFIG_ARM_ETHERH) += etherh.o obj-$(CONFIG_ARM_ETHERH) += etherh.o ../8390.o
obj-$(CONFIG_ARM_ETHER3) += ether3.o obj-$(CONFIG_ARM_ETHER3) += ether3.o
obj-$(CONFIG_ARM_ETHER1) += ether1.o obj-$(CONFIG_ARM_ETHER1) += ether1.o
obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
......
...@@ -641,15 +641,15 @@ static const struct net_device_ops etherh_netdev_ops = { ...@@ -641,15 +641,15 @@ static const struct net_device_ops etherh_netdev_ops = {
.ndo_open = etherh_open, .ndo_open = etherh_open,
.ndo_stop = etherh_close, .ndo_stop = etherh_close,
.ndo_set_config = etherh_set_config, .ndo_set_config = etherh_set_config,
.ndo_start_xmit = __ei_start_xmit, .ndo_start_xmit = ei_start_xmit,
.ndo_tx_timeout = __ei_tx_timeout, .ndo_tx_timeout = ei_tx_timeout,
.ndo_get_stats = __ei_get_stats, .ndo_get_stats = ei_get_stats,
.ndo_set_multicast_list = __ei_set_multicast_list, .ndo_set_multicast_list = ei_set_multicast_list,
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = eth_mac_addr, .ndo_set_mac_address = eth_mac_addr,
.ndo_change_mtu = eth_change_mtu, .ndo_change_mtu = eth_change_mtu,
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = __ei_poll, .ndo_poll_controller = ei_poll,
#endif #endif
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册