Commit 6dac62d3 authored by David S. Miller's avatar David S. Miller
Browse files

Revert "etherh: Get working again." 



This reverts commit 7d3d5ec1.

Russell is going to merge this in via the ARM tree.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7691367d

drivers/net/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#



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_ETHER1)	+= ether1.o

obj-$(CONFIG_ARM_AT91_ETHER)	+= at91_ether.o

drivers/net/arm/etherh.c

+5 −5
Original line number Diff line number Diff line
@@ -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

};