Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6a70184c3f237d832a265afbef7779e659686df2..56c2d75a63d49214ad518604b54579318038dd32 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -123,8 +123,7 @@ config IFB
 source "drivers/net/team/Kconfig"
 
 config MACVLAN
-       tristate "MAC-VLAN support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       tristate "MAC-VLAN support"
        ---help---
          This allows one to create virtual interfaces that map packets to
          or from specific MAC addresses to a particular interface.
@@ -138,7 +137,7 @@ config MACVLAN
          will be called macvlan.
 
 config MACVTAP
-       tristate "MAC-VLAN based tap driver (EXPERIMENTAL)"
+       tristate "MAC-VLAN based tap driver"
        depends on MACVLAN
        help
          This adds a specialized tap character device driver that is based
@@ -189,6 +188,10 @@ config NETPOLL_TRAP
 config NET_POLL_CONTROLLER
        def_bool NETPOLL
 
+config NTB_NETDEV
+       tristate "Virtual Ethernet over NTB"
+       depends on NTB
+
 config RIONET
        tristate "RapidIO Ethernet over messaging driver support"
        depends on RAPIDIO
@@ -234,8 +237,8 @@ config VETH
          versa.
 
 config VIRTIO_NET
-       tristate "Virtio network driver (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && VIRTIO
+       tristate "Virtio network driver"
+       depends on VIRTIO
        ---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.