From 5d1a1fb8244b2b2d520ad195c9c53c935a13e642 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 27 Apr 2009 02:36:20 -0700
Subject: [PATCH] --- yaml --- r: 144321 b: refs/heads/master c:
 c759a6b4e1cae6aff71f58c9c85404ebcd81b6e0 h: refs/heads/master i:   144319:
 fd7fdeb8e65133f0e62f8498b613d1d5837f6538 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netdevice.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 724a4950280d..72ba35dba791 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 785a0982eaaeae2fbe3372d1c9c769e8156a7a5a
+refs/heads/master: c759a6b4e1cae6aff71f58c9c85404ebcd81b6e0
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 2e7783f4a755..453be9a674c0 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -104,7 +104,7 @@ struct wireless_dev;
 # else
 #  define LL_MAX_HEADER 96
 # endif
-#elif defined(CONFIG_TR)
+#elif defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)
 # define LL_MAX_HEADER 48
 #else
 # define LL_MAX_HEADER 32