projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'stable/for-linus-3.7-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel...
[platform/kernel/linux-starfive.git]
/
net
/
ipv6
/
Makefile
diff --git
a/net/ipv6/Makefile
b/net/ipv6/Makefile
index
686934a
..
b6d3f79
100644
(file)
--- a/
net/ipv6/Makefile
+++ b/
net/ipv6/Makefile
@@
-36,6
+36,7
@@
obj-$(CONFIG_NETFILTER) += netfilter/
obj-$(CONFIG_IPV6_SIT) += sit.o
obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o
+obj-$(CONFIG_IPV6_GRE) += ip6_gre.o
obj-y += addrconf_core.o exthdrs_core.o