Merge branch 'for-4.3/blkcg' of git://git.kernel.dk/linux-block

[linux-2.6-block.git] / net / ipv4 / Makefile

diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile
index efc43f300b8c2655950860b437bca6d8526056df..89aacb630a53362bb9de51c7381ae9b6a799bdc3 100644 (file)
--- a/net/ipv4/Makefile
+++ b/net/ipv4/Makefile
@@ -57,7 +57,6 @@ obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o
 obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o
 obj-$(CONFIG_MEMCG_KMEM) += tcp_memcontrol.o
 obj-$(CONFIG_NETLABEL) += cipso_ipv4.o
-obj-$(CONFIG_GENEVE_CORE) += geneve_core.o
 
 obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \
                      xfrm4_output.o xfrm4_protocol.o