diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2015-08-18 20:31:23 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-10-13 03:46:00 +0100 |
| commit | a1a1e789bed910db9f193109b4481327fa8d42db (patch) | |
| tree | a81e3ce70acc5b70e7948eacec22d9501b9b30fe /net | |
| parent | d07c3d992f7b4cafa50490751725db83276554e2 (diff) | |
| download | kernel_samsung_smdk4412-a1a1e789bed910db9f193109b4481327fa8d42db.zip kernel_samsung_smdk4412-a1a1e789bed910db9f193109b4481327fa8d42db.tar.gz kernel_samsung_smdk4412-a1a1e789bed910db9f193109b4481327fa8d42db.tar.bz2 | |
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 <fengguang.wu@intel.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
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 |