diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 20:28:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 20:28:59 -0400 |
| commit | 0a68a20cc3eafa73bb54097c28b921147d7d3685 (patch) | |
| tree | 8e5f315226b618cb8e050a0c7653c8ec134501e3 /net/dccp/Kconfig | |
| parent | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (diff) | |
| parent | a3cbdde8e9c38b66b4f13ac5d6ff1939ded0ff20 (diff) | |
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp
Conflicts:
net/dccp/input.c
net/dccp/options.c
Diffstat (limited to 'net/dccp/Kconfig')
| -rw-r--r-- | net/dccp/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig index 7aa2a7acc7ec..206c16ad9c3c 100644 --- a/net/dccp/Kconfig +++ b/net/dccp/Kconfig | |||
| @@ -25,9 +25,6 @@ config INET_DCCP_DIAG | |||
| 25 | def_tristate y if (IP_DCCP = y && INET_DIAG = y) | 25 | def_tristate y if (IP_DCCP = y && INET_DIAG = y) |
| 26 | def_tristate m | 26 | def_tristate m |
| 27 | 27 | ||
| 28 | config IP_DCCP_ACKVEC | ||
| 29 | bool | ||
| 30 | |||
| 31 | source "net/dccp/ccids/Kconfig" | 28 | source "net/dccp/ccids/Kconfig" |
| 32 | 29 | ||
| 33 | menu "DCCP Kernel Hacking" | 30 | menu "DCCP Kernel Hacking" |