git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
[pandora-kernel.git]
/
net
/
ipv4
/
Kconfig
diff --git
a/net/ipv4/Kconfig
b/net/ipv4/Kconfig
index
be59774
..
8e3a1fd
100644
(file)
--- a/
net/ipv4/Kconfig
+++ b/
net/ipv4/Kconfig
@@
-252,7
+252,7
@@
config IP_MROUTE
config IP_MROUTE_MULTIPLE_TABLES
bool "IP: multicast policy routing"
- depends on IP_ADVANCED_ROUTER
+ depends on IP_
MROUTE && IP_
ADVANCED_ROUTER
select FIB_RULES
help
Normally, a multicast router runs a userspace daemon and decides