projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
net
/
dccp
/
Kconfig
diff --git
a/net/dccp/Kconfig
b/net/dccp/Kconfig
index
0549e47
..
ad6dffd
100644
(file)
--- a/
net/dccp/Kconfig
+++ b/
net/dccp/Kconfig
@@
-24,9
+24,6
@@
config INET_DCCP_DIAG
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"