debian/config/arm, debian/config/mips, debian/config/mipsel:
Remove duplicated DCCP option. svn path=/dists/trunk/linux-2.6/; revision=11562
This commit is contained in:
parent
dc0b2e0763
commit
bb9bf3afef
|
@ -1234,16 +1234,6 @@ CONFIG_ATM_MPOA=m
|
|||
#. TODO
|
||||
# CONFIG_BRIDGE is not set
|
||||
|
||||
##
|
||||
## file: net/dccp/Kconfig
|
||||
##
|
||||
CONFIG_IP_DCCP=m
|
||||
|
||||
##
|
||||
## file: net/dccp/ccids/Kconfig
|
||||
##
|
||||
CONFIG_IP_DCCP_CCID3=m
|
||||
|
||||
##
|
||||
## file: net/decnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -779,6 +779,7 @@ CONFIG_ATM_BR2684=m
|
|||
##
|
||||
## file: net/dccp/Kconfig
|
||||
##
|
||||
#. TODO
|
||||
# CONFIG_IP_DCCP is not set
|
||||
|
||||
##
|
||||
|
|
|
@ -769,16 +769,6 @@ CONFIG_ATM_BR2684=m
|
|||
##
|
||||
# CONFIG_BRIDGE_NF_EBTABLES is not set
|
||||
|
||||
##
|
||||
## file: net/dccp/Kconfig
|
||||
##
|
||||
CONFIG_IP_DCCP=m
|
||||
|
||||
##
|
||||
## file: net/dccp/ccids/Kconfig
|
||||
##
|
||||
CONFIG_IP_DCCP_CCID3=m
|
||||
|
||||
##
|
||||
## file: net/decnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -1643,20 +1643,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
|
|||
CONFIG_BRIDGE_EBT_LOG=m
|
||||
CONFIG_BRIDGE_EBT_ULOG=m
|
||||
|
||||
##
|
||||
## file: net/dccp/Kconfig
|
||||
##
|
||||
CONFIG_IP_DCCP=m
|
||||
|
||||
##
|
||||
## file: net/dccp/ccids/Kconfig
|
||||
##
|
||||
CONFIG_IP_DCCP_CCID2=m
|
||||
# CONFIG_IP_DCCP_CCID2_DEBUG is not set
|
||||
CONFIG_IP_DCCP_CCID3=m
|
||||
# CONFIG_IP_DCCP_CCID3_DEBUG is not set
|
||||
CONFIG_IP_DCCP_CCID3_RTO=100
|
||||
|
||||
##
|
||||
## file: net/decnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -1954,20 +1954,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
|
|||
CONFIG_BRIDGE_EBT_LOG=m
|
||||
CONFIG_BRIDGE_EBT_ULOG=m
|
||||
|
||||
##
|
||||
## file: net/dccp/Kconfig
|
||||
##
|
||||
CONFIG_IP_DCCP=m
|
||||
|
||||
##
|
||||
## file: net/dccp/ccids/Kconfig
|
||||
##
|
||||
CONFIG_IP_DCCP_CCID2=m
|
||||
# CONFIG_IP_DCCP_CCID2_DEBUG is not set
|
||||
CONFIG_IP_DCCP_CCID3=m
|
||||
# CONFIG_IP_DCCP_CCID3_DEBUG is not set
|
||||
CONFIG_IP_DCCP_CCID3_RTO=100
|
||||
|
||||
##
|
||||
## file: net/decnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -585,6 +585,7 @@ CONFIG_FLATMEM_MANUAL=y
|
|||
##
|
||||
## file: net/dccp/Kconfig
|
||||
##
|
||||
#. TODO
|
||||
# CONFIG_IP_DCCP is not set
|
||||
|
||||
##
|
||||
|
|
|
@ -355,6 +355,7 @@ CONFIG_FLATMEM_MANUAL=y
|
|||
##
|
||||
## file: net/dccp/Kconfig
|
||||
##
|
||||
#. TODO
|
||||
# CONFIG_IP_DCCP is not set
|
||||
|
||||
##
|
||||
|
|
|
@ -980,6 +980,7 @@ CONFIG_FLATMEM_MANUAL=y
|
|||
##
|
||||
## file: net/dccp/Kconfig
|
||||
##
|
||||
#. TODO
|
||||
# CONFIG_IP_DCCP is not set
|
||||
|
||||
##
|
||||
|
|
|
@ -1629,20 +1629,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
|
|||
CONFIG_BRIDGE_EBT_LOG=m
|
||||
CONFIG_BRIDGE_EBT_ULOG=m
|
||||
|
||||
##
|
||||
## file: net/dccp/Kconfig
|
||||
##
|
||||
CONFIG_IP_DCCP=m
|
||||
|
||||
##
|
||||
## file: net/dccp/ccids/Kconfig
|
||||
##
|
||||
CONFIG_IP_DCCP_CCID2=m
|
||||
# CONFIG_IP_DCCP_CCID2_DEBUG is not set
|
||||
CONFIG_IP_DCCP_CCID3=m
|
||||
# CONFIG_IP_DCCP_CCID3_DEBUG is not set
|
||||
CONFIG_IP_DCCP_CCID3_RTO=100
|
||||
|
||||
##
|
||||
## file: net/decnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -1953,20 +1953,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
|
|||
CONFIG_BRIDGE_EBT_LOG=m
|
||||
CONFIG_BRIDGE_EBT_ULOG=m
|
||||
|
||||
##
|
||||
## file: net/dccp/Kconfig
|
||||
##
|
||||
CONFIG_IP_DCCP=m
|
||||
|
||||
##
|
||||
## file: net/dccp/ccids/Kconfig
|
||||
##
|
||||
CONFIG_IP_DCCP_CCID2=m
|
||||
# CONFIG_IP_DCCP_CCID2_DEBUG is not set
|
||||
CONFIG_IP_DCCP_CCID3=m
|
||||
# CONFIG_IP_DCCP_CCID3_DEBUG is not set
|
||||
CONFIG_IP_DCCP_CCID3_RTO=100
|
||||
|
||||
##
|
||||
## file: net/decnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -853,6 +853,7 @@ CONFIG_FLATMEM_MANUAL=y
|
|||
##
|
||||
## file: net/dccp/Kconfig
|
||||
##
|
||||
#. TODO
|
||||
# CONFIG_IP_DCCP is not set
|
||||
|
||||
##
|
||||
|
|
|
@ -992,6 +992,7 @@ CONFIG_FLATMEM_MANUAL=y
|
|||
##
|
||||
## file: net/dccp/Kconfig
|
||||
##
|
||||
#. TODO
|
||||
# CONFIG_IP_DCCP is not set
|
||||
|
||||
##
|
||||
|
|
|
@ -979,6 +979,7 @@ CONFIG_FLATMEM_MANUAL=y
|
|||
##
|
||||
## file: net/dccp/Kconfig
|
||||
##
|
||||
#. TODO
|
||||
# CONFIG_IP_DCCP is not set
|
||||
|
||||
##
|
||||
|
|
Loading…
Reference in New Issue