Merge branch 'acpica' into release

[firefly-linux-kernel-4.4.55.git] / include / linux / if_ether.h

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 580b6004d00eb0b34d0681175a85dce489b12574..299b4121f91486b90780601f2e6bc389674131e8 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -136,13 +136,7 @@ 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]
 
 #endif