Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e58468b02987f28c57252c1acdbfa8ac4c6365ca..d18eb607bee66ab1f586059a44de4fefd94352da 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -180,8 +180,8 @@ config VXLAN
          will be called vxlan.
 
 config GENEVE
-       tristate "Generic Network Virtualization Encapsulation netdev"
-       depends on INET && GENEVE_CORE
+       tristate "Generic Network Virtualization Encapsulation"
+       depends on INET && NET_UDP_TUNNEL
        select NET_IP_TUNNEL
        ---help---
          This allows one to create geneve virtual interfaces that provide
@@ -282,7 +282,6 @@ config VETH
 config VIRTIO_NET
        tristate "Virtio network driver"
        depends on VIRTIO
-       select AVERAGE
        ---help---
          This is the virtual network driver for virtio.  It can be used with
          lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.
@@ -414,6 +413,13 @@ config VMXNET3
          To compile this driver as a module, choose M here: the
          module will be called vmxnet3.
 
+config FUJITSU_ES
+       tristate "FUJITSU Extended Socket Network Device driver"
+       depends on ACPI
+       help
+         This driver provides support for Extended Socket network device
+          on Extended Partitioning of FUJITSU PRIMEQUEST 2000 E2 series.
+
 source "drivers/net/hyperv/Kconfig"
 
 endif # NETDEVICES