diff --git a/[refs] b/[refs] index 7052c333268d..5d4d60b4d9ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b17d50f9e9034be3fe0414dc3492c0071dba75c +refs/heads/master: 8a6dfd43d1891882f8ca05d73aa7735fb0edae3b diff --git a/trunk/net/ipv6/Kconfig b/trunk/net/ipv6/Kconfig index f56199827452..a578096152ab 100644 --- a/trunk/net/ipv6/Kconfig +++ b/trunk/net/ipv6/Kconfig @@ -171,7 +171,7 @@ config IPV6_SIT Saying M here will produce a module called sit. If unsure, say Y. config IPV6_SIT_6RD - bool "IPv6: IPv6 Rapid Development (6RD) (EXPERIMENTAL)" + bool "IPv6: IPv6 Rapid Deployment (6RD) (EXPERIMENTAL)" depends on IPV6_SIT && EXPERIMENTAL default n ---help---