commit f3d4039242af92a9d93dee2fd9ae47066b20ca29
author Paul Bolle <pebolle@tiscali.nl> Wed Mar 27 10:52:28 2013 +0000
committer David S. Miller <davem@davemloft.net> Wed Mar 27 23:24:51 2013 -0400
tree c6d841b45268cb820e263af6794db6a0477e0308
parent fbbdb8f096e0e5d8244e1ffa46e364146ab9a440

tokenring: delete last holdout of CONFIG_TR

Tokenring support was deleted in v3.5. One last holdout of the macro
CONFIG_TR escaped that fate. Until now.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>

include/linux/netdevice.h

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 56e3e06..1dbb02c 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -144,8 +144,6 @@
 # else
 #  define LL_MAX_HEADER 96
 # endif
-#elif IS_ENABLED(CONFIG_TR)
-# define LL_MAX_HEADER 48
 #else
 # define LL_MAX_HEADER 32
 #endif