diff options
| author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2010-04-13 20:21:16 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-14 04:49:52 -0700 |
| commit | 8f617541750e9b81ec50e31169e9994d7bc3aaae (patch) | |
| tree | ccdf51a634fa63148812518eb98ff86131a59e44 /drivers | |
| parent | 3d90c508dc6737d5b241a1f8807e1287f015f7f8 (diff) | |
| download | blackbird-op-linux-8f617541750e9b81ec50e31169e9994d7bc3aaae.tar.gz blackbird-op-linux-8f617541750e9b81ec50e31169e9994d7bc3aaae.zip | |
stmmac: fix vlan support setup
Moved STMMAC_VLAN_TAG_USED from stmmac.h to common.h header
because it is used within the device and descriptor cores.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/stmmac/common.h | 5 | ||||
| -rw-r--r-- | drivers/net/stmmac/stmmac.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/stmmac/common.h b/drivers/net/stmmac/common.h index 27a05b443ec3..144f76fd3e39 100644 --- a/drivers/net/stmmac/common.h +++ b/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/drivers/net/stmmac/stmmac.h b/drivers/net/stmmac/stmmac.h index 0d776bc23143..1a6eb7baa298 100644 --- a/drivers/net/stmmac/stmmac.h +++ b/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" |
