Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux...

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

diff --git a/net/mpls/Kconfig b/net/mpls/Kconfig
index 17bde799c8548e46a791fabc8b9619c57f2b2f99..5c467ef973114c49b352ac64ed248e4199d3d0f3 100644 (file)
--- a/net/mpls/Kconfig
+++ b/net/mpls/Kconfig
@@ -24,7 +24,13 @@ config NET_MPLS_GSO
 
 config MPLS_ROUTING
        tristate "MPLS: routing support"
-       help
+       ---help---
         Add support for forwarding of mpls packets.
 
+config MPLS_IPTUNNEL
+       tristate "MPLS: IP over MPLS tunnel support"
+       depends on LWTUNNEL && MPLS_ROUTING
+       ---help---
+        mpls ip tunnel support.
+
 endif # MPLS