aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2007-11-21 07:11:52 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:54:46 -0500
commit6d57b43bf810cd66ccf252c04ba65c3e8e56cbb1 (patch)
treecd3ed95ee320ce230ce1c94f5fed52af4df4c452
parente333b3edc489151afda2a4f6c798842c64cb67a4 (diff)
[DCCP]: Remove redundant dependency on IP_DCCP
This cleans up the consequences of an earlier patch which introduced the `if IP_DCCP' clause into net/dccp/Kconfig. The CCID Kconfig menu is sourced within this clause; as a consequence, all tests of type `depends on IP_DCCP' are now redundant. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/dccp/ccids/Kconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig
index f37af17556ba..3d7d867a7c4e 100644
--- a/net/dccp/ccids/Kconfig
+++ b/net/dccp/ccids/Kconfig
@@ -1,9 +1,8 @@
1menu "DCCP CCIDs Configuration (EXPERIMENTAL)" 1menu "DCCP CCIDs Configuration (EXPERIMENTAL)"
2 depends on IP_DCCP && EXPERIMENTAL 2 depends on EXPERIMENTAL
3 3
4config IP_DCCP_CCID2 4config IP_DCCP_CCID2
5 tristate "CCID2 (TCP-Like) (EXPERIMENTAL)" 5 tristate "CCID2 (TCP-Like) (EXPERIMENTAL)"
6 depends on IP_DCCP
7 def_tristate IP_DCCP 6 def_tristate IP_DCCP
8 select IP_DCCP_ACKVEC 7 select IP_DCCP_ACKVEC
9 ---help--- 8 ---help---
@@ -38,7 +37,6 @@ config IP_DCCP_CCID2_DEBUG
38 37
39config IP_DCCP_CCID3 38config IP_DCCP_CCID3
40 tristate "CCID3 (TCP-Friendly) (EXPERIMENTAL)" 39 tristate "CCID3 (TCP-Friendly) (EXPERIMENTAL)"
41 depends on IP_DCCP
42 def_tristate IP_DCCP 40 def_tristate IP_DCCP
43 ---help--- 41 ---help---
44 CCID 3 denotes TCP-Friendly Rate Control (TFRC), an equation-based 42 CCID 3 denotes TCP-Friendly Rate Control (TFRC), an equation-based