From 62d4d61ac92579b0a3162d4bd6ac1c56c6f96463 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 21 Feb 2009 23:41:57 -0800
Subject: [PATCH] --- yaml --- r: 134649 b: refs/heads/master c:
 7d3d5ec168f1f40e8547d2a1659670ef222a053b h: refs/heads/master i:   134647:
 97629a9f16117425bc11b3da711f8c8891010f52 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/net/arm/Makefile |  2 +-
 trunk/drivers/net/arm/etherh.c | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 25bb6a67408b..a67530b00a1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66da8c529ad4d330a268ac08aa101b87c5c911ff
+refs/heads/master: 7d3d5ec168f1f40e8547d2a1659670ef222a053b
diff --git a/trunk/drivers/net/arm/Makefile b/trunk/drivers/net/arm/Makefile
index c69c0cdba4a2..811a3ccd14c1 100644
--- a/trunk/drivers/net/arm/Makefile
+++ b/trunk/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/trunk/drivers/net/arm/etherh.c b/trunk/drivers/net/arm/etherh.c
index 54b52e5b1821..f52f668c49bf 100644
--- a/trunk/drivers/net/arm/etherh.c
+++ b/trunk/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
 };