From 82a7828b30affffd66703e24301f59c8fe7db9e5 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Fri, 9 Jan 2009 13:01:07 +0000
Subject: [PATCH] --- yaml --- r: 133794 b: refs/heads/master c:
 60961ce4d09db7c1ba49da3375123a18845ec864 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/net/appletalk/dev.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 7e778208c189..0c2c5963b951 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3170c6568776a58e1eeec8ff949a65f5cf5d7ceb
+refs/heads/master: 60961ce4d09db7c1ba49da3375123a18845ec864
diff --git a/trunk/net/appletalk/dev.c b/trunk/net/appletalk/dev.c
index d856a62ab50f..72277d70c980 100644
--- a/trunk/net/appletalk/dev.c
+++ b/trunk/net/appletalk/dev.c
@@ -9,22 +9,20 @@
 #include <linux/if_arp.h>
 #include <linux/if_ltalk.h>
 
+#ifdef CONFIG_COMPAT_NET_DEV_OPS
 static int ltalk_change_mtu(struct net_device *dev, int mtu)
 {
 	return -EINVAL;
 }
-
-static int ltalk_mac_addr(struct net_device *dev, void *addr)
-{
-	return -EINVAL;
-}
+#endif
 
 static void ltalk_setup(struct net_device *dev)
 {
 	/* Fill in the fields of the device structure with localtalk-generic values. */
 
+#ifdef CONFIG_COMPAT_NET_DEV_OPS
 	dev->change_mtu		= ltalk_change_mtu;
-	dev->set_mac_address 	= ltalk_mac_addr;
+#endif
 
 	dev->type		= ARPHRD_LOCALTLK;
 	dev->hard_header_len 	= LTALK_HLEN;