diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-08 00:39:24 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-08 00:39:24 +0100 |
| commit | ef28a4e6ecb8fbe742ea51fc9ec836b5289d1301 (patch) | |
| tree | 32b1ace24f341cbf0c25cfb66f506be398a43683 /drivers/net/Kconfig | |
| parent | net: allow handlers to be processed for orig_dev (diff) | |
| parent | r8169: convert to new VLAN model. (diff) | |
| download | linux-ef28a4e6ecb8fbe742ea51fc9ec836b5289d1301.tar.xz linux-ef28a4e6ecb8fbe742ea51fc9ec836b5289d1301.zip | |
Merge branch 'davem-next.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index fba89ae2926b..7ce3dd01d6eb 100644 --- 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 |