Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo...

[~andy/linux] / net / sysctl_net.c

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index f3e813a8d107765f2040f6328787c920a6f69516..e3a6e37cd1c536cc93d5caa850219e4104bb646b 100644 (file)
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -26,10 +26,6 @@
 #include <linux/if_ether.h>
 #endif
 
-#ifdef CONFIG_TR
-#include <linux/if_tr.h>
-#endif
-
 static struct ctl_table_set *
 net_ctl_header_lookup(struct ctl_table_root *root, struct nsproxy *namespaces)
 {