From 0f833b026ec8c7cb196dbc9f4a3cb60f335302f0 Mon Sep 17 00:00:00 2001
From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date: Tue, 13 Apr 2010 20:21:16 +0000
Subject: [PATCH] --- yaml --- r: 194066 b: refs/heads/master c:
 8f617541750e9b81ec50e31169e9994d7bc3aaae h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/stmmac/common.h | 5 +++++
 trunk/drivers/net/stmmac/stmmac.h | 5 -----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7afb4bddcf1b..2d0718425e3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d90c508dc6737d5b241a1f8807e1287f015f7f8
+refs/heads/master: 8f617541750e9b81ec50e31169e9994d7bc3aaae
diff --git a/trunk/drivers/net/stmmac/common.h b/trunk/drivers/net/stmmac/common.h
index 27a05b443ec3..144f76fd3e39 100644
--- a/trunk/drivers/net/stmmac/common.h
+++ b/trunk/drivers/net/stmmac/common.h
@@ -23,6 +23,11 @@
 *******************************************************************************/
 
 #include <linux/netdevice.h>
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+#define STMMAC_VLAN_TAG_USED
+#include <linux/if_vlan.h>
+#endif
+
 #include "descs.h"
 
 #undef CHIP_DEBUG_PRINT
diff --git a/trunk/drivers/net/stmmac/stmmac.h b/trunk/drivers/net/stmmac/stmmac.h
index 0d776bc23143..1a6eb7baa298 100644
--- a/trunk/drivers/net/stmmac/stmmac.h
+++ b/trunk/drivers/net/stmmac/stmmac.h
@@ -23,11 +23,6 @@
 #define DRV_MODULE_VERSION	"Jan_2010"
 #include <linux/stmmac.h>
 
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-#define STMMAC_VLAN_TAG_USED
-#include <linux/if_vlan.h>
-#endif
-
 #include "common.h"
 #ifdef CONFIG_STMMAC_TIMER
 #include "stmmac_timer.h"