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 'master' of /repos/git/net-next-2.6
[pandora-kernel.git]
/
net
/
ipv4
/
Kconfig
diff --git
a/net/ipv4/Kconfig
b/net/ipv4/Kconfig
index
a5a1050
..
8949a05
100644
(file)
--- a/
net/ipv4/Kconfig
+++ b/
net/ipv4/Kconfig
@@
-140,6
+140,9
@@
config IP_ROUTE_VERBOSE
handled by the klogd daemon which is responsible for kernel messages
("man klogd").
+config IP_ROUTE_CLASSID
+ bool
+
config IP_PNP
bool "IP: kernel level autoconfiguration"
help
@@
-657,4
+660,3
@@
config TCP_MD5SIG
on the Internet.
If unsure, say N.
-