projects
/
linux-2.6-block.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/anholt...
[linux-2.6-block.git]
/
net
/
dccp
/
Kconfig
diff --git
a/net/dccp/Kconfig
b/net/dccp/Kconfig
index 7aa2a7acc7ec815ab34f7d35df05425bd8765e2a..ad6dffd9070e3ce818f2e85261b2bac2fca55e36 100644
(file)
--- a/
net/dccp/Kconfig
+++ b/
net/dccp/Kconfig
@@
-1,7
+1,6
@@
menuconfig IP_DCCP
tristate "The DCCP Protocol (EXPERIMENTAL)"
depends on INET && EXPERIMENTAL
menuconfig IP_DCCP
tristate "The DCCP Protocol (EXPERIMENTAL)"
depends on INET && EXPERIMENTAL
- select IP_DCCP_CCID2
---help---
Datagram Congestion Control Protocol (RFC 4340)
---help---
Datagram Congestion Control Protocol (RFC 4340)
@@
-25,9
+24,6
@@
config INET_DCCP_DIAG
def_tristate y if (IP_DCCP = y && INET_DIAG = y)
def_tristate m
def_tristate y if (IP_DCCP = y && INET_DIAG = y)
def_tristate m
-config IP_DCCP_ACKVEC
- bool
-
source "net/dccp/ccids/Kconfig"
menu "DCCP Kernel Hacking"
source "net/dccp/ccids/Kconfig"
menu "DCCP Kernel Hacking"