diff --git a/[refs] b/[refs]
index ceb76791ecfa..3bd51b47c92d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f277e65e7a2d360189f760baca42f3ca2f62dd7a
+refs/heads/master: 2ea6d8c446752008df7f37867f0cf7483533b05e
diff --git a/trunk/net/Makefile b/trunk/net/Makefile
index a3330ebe2c53..a51d9465e628 100644
--- a/trunk/net/Makefile
+++ b/trunk/net/Makefile
@@ -19,9 +19,7 @@ obj-$(CONFIG_NETFILTER)		+= netfilter/
 obj-$(CONFIG_INET)		+= ipv4/
 obj-$(CONFIG_XFRM)		+= xfrm/
 obj-$(CONFIG_UNIX)		+= unix/
-ifneq ($(CONFIG_IPV6),)
-obj-y				+= ipv6/
-endif
+obj-$(CONFIG_NET)		+= ipv6/
 obj-$(CONFIG_PACKET)		+= packet/
 obj-$(CONFIG_NET_KEY)		+= key/
 obj-$(CONFIG_BRIDGE)		+= bridge/