projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mfd-for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[cascardo/linux.git]
/
net
/
ipv6
/
Kconfig
diff --git
a/net/ipv6/Kconfig
b/net/ipv6/Kconfig
index
11e875f
..
3f84113
100644
(file)
--- a/
net/ipv6/Kconfig
+++ b/
net/ipv6/Kconfig
@@
-218,6
+218,7
@@
config IPV6_GRE
tristate "IPv6: GRE tunnel"
select IPV6_TUNNEL
select NET_IP_TUNNEL
+ depends on NET_IPGRE_DEMUX
---help---
Tunneling means encapsulating data of one protocol type within
another protocol and sending it over a channel that understands the