summaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2011-03-01 17:18:33 +0100
committerFrancois Romieu <romieu@fr.zoreil.com>2011-03-05 10:04:50 +0100
commit7a8fc77b3744e26ce1249d9ccb23e356d6010679 (patch)
tree42884ba3aaab6ec157e904be4f9d98ed358bcfbd /drivers/net/Kconfig
parent54405cde762408b00a445466a40da4f7f33a8479 (diff)
r8169: convert to new VLAN model.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Reviewed-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r--drivers/net/Kconfig9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f4b39274308..8d0d16f9357 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2236,15 +2236,6 @@ config R8169
To compile this driver as a module, choose M here: the module
will be called r8169. This is recommended.
-config R8169_VLAN
- bool "VLAN support"
- depends on R8169 && VLAN_8021Q
- ---help---
- Say Y here for the r8169 driver to support the functions required
- by the kernel 802.1Q code.
-
- If in doubt, say Y.
-
config SB1250_MAC
tristate "SB1250 Gigabit Ethernet support"
depends on SIBYTE_SB1xxx_SOC