diff options
| author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2010-04-13 16:21:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-14 07:49:52 -0400 |
| commit | 8f617541750e9b81ec50e31169e9994d7bc3aaae (patch) | |
| tree | ccdf51a634fa63148812518eb98ff86131a59e44 /drivers/net/stmmac/stmmac.h | |
| parent | 3d90c508dc6737d5b241a1f8807e1287f015f7f8 (diff) | |
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/net/stmmac/stmmac.h')
| -rw-r--r-- | drivers/net/stmmac/stmmac.h | 5 |
1 files changed, 0 insertions, 5 deletions
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 @@ | |||
| 23 | #define DRV_MODULE_VERSION "Jan_2010" | 23 | #define DRV_MODULE_VERSION "Jan_2010" |
| 24 | #include <linux/stmmac.h> | 24 | #include <linux/stmmac.h> |
| 25 | 25 | ||
| 26 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) | ||
| 27 | #define STMMAC_VLAN_TAG_USED | ||
| 28 | #include <linux/if_vlan.h> | ||
| 29 | #endif | ||
| 30 | |||
| 31 | #include "common.h" | 26 | #include "common.h" |
| 32 | #ifdef CONFIG_STMMAC_TIMER | 27 | #ifdef CONFIG_STMMAC_TIMER |
| 33 | #include "stmmac_timer.h" | 28 | #include "stmmac_timer.h" |