Merge branch 'davem-next.r8169' of git://git.kernel.org/pub/scm/linux…

…/kernel/git/romieu/netdev-2.6
git-mirror · Mar 7, 2011 · ef28a4e · ef28a4e
2 parents e3f48d3 + 7a8fc77
commit ef28a4e
Show file tree

Hide file tree

Showing 2 changed files with 178 additions and 103 deletions.
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
@@ -2245,15 +2245,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