Merge branches 'pm-sleep', 'pm-cpufreq', 'pm-core' and 'pm-opp'

[cascardo/linux.git] / drivers / net / ethernet / intel / Kconfig

diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 714bd10..c0e1743 100644 (file)
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -167,17 +167,6 @@ config IXGBE
          To compile this driver as a module, choose M here. The module
          will be called ixgbe.
 
-config IXGBE_VXLAN
-       bool "Virtual eXtensible Local Area Network Support"
-       default n
-       depends on IXGBE && VXLAN && !(IXGBE=y && VXLAN=m)
-       ---help---
-         This allows one to create VXLAN virtual interfaces that provide
-         Layer 2 Networks over Layer 3 Networks. VXLAN is often used
-         to tunnel virtual network infrastructure in virtualized environments.
-         Say Y here if you want to use Virtual eXtensible Local Area Network
-         (VXLAN) in the driver.
-
 config IXGBE_HWMON
        bool "Intel(R) 10GbE PCI Express adapters HWMON support"
        default y
@@ -236,27 +225,6 @@ config I40E
          To compile this driver as a module, choose M here. The module
          will be called i40e.
 
-config I40E_VXLAN
-       bool "Virtual eXtensible Local Area Network Support"
-       default n
-       depends on I40E && VXLAN && !(I40E=y && VXLAN=m)
-       ---help---
-         This allows one to create VXLAN virtual interfaces that provide
-         Layer 2 Networks over Layer 3 Networks. VXLAN is often used
-         to tunnel virtual network infrastructure in virtualized environments.
-         Say Y here if you want to use Virtual eXtensible Local Area Network
-         (VXLAN) in the driver.
-
-config I40E_GENEVE
-       bool "Generic Network Virtualization Encapsulation (GENEVE) Support"
-       depends on I40E && GENEVE && !(I40E=y && GENEVE=m)
-       default n
-       ---help---
-         This allows one to create GENEVE virtual interfaces that provide
-         Layer 2 Networks over Layer 3 Networks. GENEVE is often used
-         to tunnel virtual network infrastructure in virtualized environments.
-         Say Y here if you want to use GENEVE in the driver.
-
 config I40E_DCB
        bool "Data Center Bridging (DCB) Support"
        default n
@@ -307,15 +275,4 @@ config FM10K
          To compile this driver as a module, choose M here. The module
          will be called fm10k.  MSI-X interrupt support is required
 
-config FM10K_VXLAN
-       bool "Virtual eXtensible Local Area Network Support"
-       default n
-       depends on FM10K && VXLAN && !(FM10K=y && VXLAN=m)
-       ---help---
-         This allows one to create VXLAN virtual interfaces that provide
-         Layer 2 Networks over Layer 3 Networks. VXLAN is often used
-         to tunnel virtual network infrastructure in virtualized environments.
-         Say Y here if you want to use Virtual eXtensible Local Area Network
-         (VXLAN) in the driver.
-
 endif # NET_VENDOR_INTEL