diff --git a/[refs] b/[refs] index f75f6e9ead3f..0d90478d6a00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 686a7e32ca7fdd819eb9606abd3db52b77d1479f +refs/heads/master: 9d931dd2ed62c14d7bf7c4c3ab3ef7610c46ca9b diff --git a/trunk/include/linux/if_ether.h b/trunk/include/linux/if_ether.h index 0f1325d98295..0065ffd3226b 100644 --- a/trunk/include/linux/if_ether.h +++ b/trunk/include/linux/if_ether.h @@ -132,10 +132,6 @@ static inline struct ethhdr *eth_hdr(const struct sk_buff *skb) int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr); -#ifdef CONFIG_SYSCTL -extern struct ctl_table ether_table[]; -#endif - int mac_pton(const char *s, u8 *mac); extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len);