diff --git a/[refs] b/[refs]
index f5b3236bd68d..539a500f2b24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86cf42e4e029b83110cf98692420239103363dbf
+refs/heads/master: 6aef4fdfeaec5f2c66415f2cafa98a3ff927501f
diff --git a/trunk/net/core/Makefile b/trunk/net/core/Makefile
index 5e0c56b7f607..f5f5e58943e8 100644
--- a/trunk/net/core/Makefile
+++ b/trunk/net/core/Makefile
@@ -7,9 +7,10 @@ obj-y := sock.o request_sock.o skbuff.o iovec.o datagram.o stream.o scm.o \
 
 obj-$(CONFIG_SYSCTL) += sysctl_net_core.o
 
-obj-y		     += flow.o dev.o ethtool.o dev_mcast.o dst.o \
+obj-y		     += dev.o ethtool.o dev_mcast.o dst.o \
 			neighbour.o rtnetlink.o utils.o link_watch.o filter.o
 
+obj-$(CONFIG_XFRM) += flow.o
 obj-$(CONFIG_SYSFS) += net-sysfs.o
 obj-$(CONFIG_NETFILTER) += netfilter.o
 obj-$(CONFIG_NET_DIVERT) += dv.o