diff --git a/[refs] b/[refs] index b091c1cc7712..0f45940aff32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b216a4d86fb599fa2808ea7456e15ca9b47bc756 +refs/heads/master: fc18162520b642a46ea556300bfdee80810fc538 diff --git a/trunk/net/l2tp/Kconfig b/trunk/net/l2tp/Kconfig index 4b1e71751e10..147a8fd47a17 100644 --- a/trunk/net/l2tp/Kconfig +++ b/trunk/net/l2tp/Kconfig @@ -4,6 +4,7 @@ menuconfig L2TP tristate "Layer Two Tunneling Protocol (L2TP)" + depends on (IPV6 || IPV6=n) depends on INET ---help--- Layer Two Tunneling Protocol