From 04d824a25a1e220d3955947264f492fceb0dd781 Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Wed, 15 Apr 2009 07:58:29 +0000
Subject: [PATCH] --- yaml --- r: 149740 b: refs/heads/master c:
 eb9bdaee550e4a56592ae12171b0be6de8fc9d17 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/net/8390.c  | 10 ++--------
 trunk/drivers/net/8390p.c | 10 ++--------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 8d0faa4f6c3a..7bbb7f54825f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84381eed93c974024402eda250c9e7890b72ca4a
+refs/heads/master: eb9bdaee550e4a56592ae12171b0be6de8fc9d17
diff --git a/trunk/drivers/net/8390.c b/trunk/drivers/net/8390.c
index ec3e22e6306f..21153dea8ebe 100644
--- a/trunk/drivers/net/8390.c
+++ b/trunk/drivers/net/8390.c
@@ -74,14 +74,8 @@ EXPORT_SYMBOL(ei_netdev_ops);
 struct net_device *__alloc_ei_netdev(int size)
 {
 	struct net_device *dev = ____alloc_ei_netdev(size);
-#ifdef CONFIG_COMPAT_NET_DEV_OPS
-	if (dev) {
-		dev->hard_start_xmit = ei_start_xmit;
-		dev->get_stats	= ei_get_stats;
-		dev->set_multicast_list = ei_set_multicast_list;
-		dev->tx_timeout = ei_tx_timeout;
-	}
-#endif
+	if (dev)
+		dev->netdev_ops = &ei_netdev_ops;
 	return dev;
 }
 EXPORT_SYMBOL(__alloc_ei_netdev);
diff --git a/trunk/drivers/net/8390p.c b/trunk/drivers/net/8390p.c
index da863c91d1d0..6ec11dafdb18 100644
--- a/trunk/drivers/net/8390p.c
+++ b/trunk/drivers/net/8390p.c
@@ -79,14 +79,8 @@ EXPORT_SYMBOL(eip_netdev_ops);
 struct net_device *__alloc_eip_netdev(int size)
 {
 	struct net_device *dev = ____alloc_ei_netdev(size);
-#ifdef CONFIG_COMPAT_NET_DEV_OPS
-	if (dev) {
-		dev->hard_start_xmit = eip_start_xmit;
-		dev->get_stats	= eip_get_stats;
-		dev->set_multicast_list = eip_set_multicast_list;
-		dev->tx_timeout = eip_tx_timeout;
-	}
-#endif
+	if (dev)
+		dev->netdev_ops = &eip_netdev_ops;
 	return dev;
 }
 EXPORT_SYMBOL(__alloc_eip_netdev);