diff options
| author | Thomas Graf <tgraf@infradead.org> | 2011-03-03 23:35:07 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-07 12:50:52 -0800 |
| commit | 2ea6d8c446752008df7f37867f0cf7483533b05e (patch) | |
| tree | 54bd35eed335afe32bad4fd0e81950c185222303 /net | |
| parent | f277e65e7a2d360189f760baca42f3ca2f62dd7a (diff) | |
net: Enter net/ipv6/ even if CONFIG_IPV6=n
exthdrs_core.c and addrconf_core.c in net/ipv6/ contain bits which
must be made available even if IPv6 is disabled.
net/ipv6/Makefile already correctly includes them if CONFIG_IPV6=n
but net/Makefile prevents entering the subdirectory.
Signed-off-by: Thomas Graf <tgraf@infradead.org>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/Makefile b/net/Makefile index a3330ebe2c53..a51d9465e628 100644 --- a/net/Makefile +++ b/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/ |