From 00e25be2f9e412bdc751e8f7d826ae52298fd42b Mon Sep 17 00:00:00 2001
From: Marin Mitov <mitov@issp.bas.bg>
Date: Fri, 13 Nov 2009 07:58:41 +0000
Subject: [PATCH] --- yaml --- r: 171577 b: refs/heads/master c:
 b9f5d52670c27e71f04c466aee77e3a2eeca8080 h: refs/heads/master i:   171575:
 3e1a23099e8b1c7bfac6e452179a5f2432a6b58d v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/if_ether.h | 4 ----
 trunk/net/ethernet/eth.c       | 7 -------
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 7182a4925848..9fec2dab35e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d6682db114cb53bc94991659478756302e6a600
+refs/heads/master: b9f5d52670c27e71f04c466aee77e3a2eeca8080
diff --git a/trunk/include/linux/if_ether.h b/trunk/include/linux/if_ether.h
index 580b6004d00e..005e1525ab86 100644
--- a/trunk/include/linux/if_ether.h
+++ b/trunk/include/linux/if_ether.h
@@ -136,10 +136,6 @@ extern struct ctl_table ether_table[];
 
 extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len);
 
-/*
- *	Display a 6 byte device address (MAC) in a readable format.
- */
-extern char *print_mac(char *buf, const unsigned char *addr) __deprecated;
 #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
 #define MAC_BUF_SIZE	18
 #define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE]
diff --git a/trunk/net/ethernet/eth.c b/trunk/net/ethernet/eth.c
index 5a883affecd3..dd3db88f8f0a 100644
--- a/trunk/net/ethernet/eth.c
+++ b/trunk/net/ethernet/eth.c
@@ -393,10 +393,3 @@ ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len)
 	return ((ssize_t) l);
 }
 EXPORT_SYMBOL(sysfs_format_mac);
-
-char *print_mac(char *buf, const unsigned char *addr)
-{
-	_format_mac_addr(buf, MAC_BUF_SIZE, addr, ETH_ALEN);
-	return buf;
-}
-EXPORT_SYMBOL(print_mac);