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

ef28a4e6 · David S. Miller · e3f48d37 · 7a8fc77b · ef28a4e6 · ef28a4e6
Commit ef28a4e6 authored Mar 07, 2011 by David S. Miller
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 178 additions and 103 deletions

drivers/net/Kconfig drivers/net/Kconfig +0 -9

drivers/net/r8169.c drivers/net/r8169.c +178 -94

No files found.
--- 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

--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c