From a1a1e789bed910db9f193109b4481327fa8d42db Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 18 Aug 2015 20:31:23 +0200 Subject: ipv6: Fix build failure when CONFIG_INET disabled output_core.c, added in 3.2.66, is only needed and can only be compiled when CONFIG_INET is enabled. The condition in the Makefile is already correct upstream. Reported-by: kbuild test robot Signed-off-by: Ben Hutchings --- net/ipv6/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'net') diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile index 4b20d56..8b25fbb 100644 --- a/net/ipv6/Makefile +++ b/net/ipv6/Makefile @@ -37,6 +37,7 @@ obj-$(CONFIG_NETFILTER) += netfilter/ obj-$(CONFIG_IPV6_SIT) += sit.o obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o -obj-y += addrconf_core.o exthdrs_core.o output_core.o +obj-y += addrconf_core.o exthdrs_core.o +obj-$(CONFIG_INET) += output_core.o obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o -- cgit v1.1