aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2011-03-01 11:18:33 -0500
committerFrancois Romieu <romieu@fr.zoreil.com>2011-03-05 04:04:50 -0500
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 f4b39274308a..8d0d16f93571 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2236,15 +2236,6 @@ config R8169
2236 To compile this driver as a module, choose M here: the module 2236 To compile this driver as a module, choose M here: the module
2237 will be called r8169. This is recommended. 2237 will be called r8169. This is recommended.
2238 2238
2239config R8169_VLAN
2240 bool "VLAN support"
2241 depends on R8169 && VLAN_8021Q
2242 ---help---
2243 Say Y here for the r8169 driver to support the functions required
2244 by the kernel 802.1Q code.
2245
2246 If in doubt, say Y.
2247
2248config SB1250_MAC 2239config SB1250_MAC
2249 tristate "SB1250 Gigabit Ethernet support" 2240 tristate "SB1250 Gigabit Ethernet support"
2250 depends on SIBYTE_SB1xxx_SOC 2241 depends on SIBYTE_SB1xxx_SOC