diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-07 18:39:24 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-07 18:39:24 -0500 |
| commit | ef28a4e6ecb8fbe742ea51fc9ec836b5289d1301 (patch) | |
| tree | 32b1ace24f341cbf0c25cfb66f506be398a43683 /drivers/net/Kconfig | |
| parent | e3f48d37cf87a4a94e9f05fddc39b0e5f2307c27 (diff) | |
| parent | 7a8fc77b3744e26ce1249d9ccb23e356d6010679 (diff) | |
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 fba89ae2926..7ce3dd01d6e 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2245,15 +2245,6 @@ config R8169 | |||
| 2245 | To compile this driver as a module, choose M here: the module | 2245 | To compile this driver as a module, choose M here: the module |
| 2246 | will be called r8169. This is recommended. | 2246 | will be called r8169. This is recommended. |
| 2247 | 2247 | ||
| 2248 | config R8169_VLAN | ||
| 2249 | bool "VLAN support" | ||
| 2250 | depends on R8169 && VLAN_8021Q | ||
| 2251 | ---help--- | ||
| 2252 | Say Y here for the r8169 driver to support the functions required | ||
| 2253 | by the kernel 802.1Q code. | ||
| 2254 | |||
| 2255 | If in doubt, say Y. | ||
| 2256 | |||
| 2257 | config SB1250_MAC | 2248 | config SB1250_MAC |
| 2258 | tristate "SB1250 Gigabit Ethernet support" | 2249 | tristate "SB1250 Gigabit Ethernet support" |
| 2259 | depends on SIBYTE_SB1xxx_SOC | 2250 | depends on SIBYTE_SB1xxx_SOC |