---

yaml --- r: 233880 b: refs/heads/master c: 2ea6d8c h: refs/heads/master v: v3
git-mirror · Mar 7, 2011 · 97b59c6 · 97b59c6
1 parent 6aa2b5c
commit 97b59c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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/