[kernel] r8934 - dists/trunk/linux-2.6/debian/arch

Thu Jun 7 11:16:31 UTC 2007

Author: maks
Date: Thu Jun  7 11:16:31 2007
New Revision: 8934

Log:
topconfig sorting, no functional change


Modified:
   dists/trunk/linux-2.6/debian/arch/config

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================

--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Thu Jun  7 11:16:31 2007
@@ -221,12 +221,12 @@
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_TUNNEL=m
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETLABEL is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
 
-
 #
 # Core Netfilter Configuration
 #
@@ -249,9 +249,8 @@
 CONFIG_NF_CONNTRACK_PPTP=m
 CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -321,6 +320,7 @@
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -381,14 +381,39 @@
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+CONFIG_IP_DCCP_ACKVEC=y
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+CONFIG_IP_DCCP_CCID2=m
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_TFRC_LIB=m
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_CCID3_RTO=100
 
 #
-# SCTP Configuration (EXPERIMENTAL)
+# DCCP Kernel Hacking
 #
+# CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+CONFIG_TIPC=m
+CONFIG_TIPC_ADVANCED=y
+CONFIG_TIPC_ZONES=3
+CONFIG_TIPC_CLUSTERS=1
+CONFIG_TIPC_NODES=255
+CONFIG_TIPC_SLAVE_NODES=0
+CONFIG_TIPC_PORTS=8191
+CONFIG_TIPC_LOG=0
+# CONFIG_TIPC_DEBUG is not set
 
 #
 # Classification
@@ -1280,8 +1305,6 @@
 CONFIG_FUSE_FS=m
 CONFIG_VIDEO_SELECT=y
 CONFIG_CRC16=m
-CONFIG_IP_DCCP=m
-CONFIG_IP_DCCP_TFRC_LIB=m
 CONFIG_SIS190=m
 CONFIG_SND_AD1889=m
 CONFIG_USB_NET_CDCETHER=m
@@ -1290,7 +1313,6 @@
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_9P_FS=m
-CONFIG_INET_DCCP_DIAG=m
 CONFIG_CASSINI=m
 CONFIG_USB_STORAGE_ONETOUCH=y
 CONFIG_DRM_SAVAGE=m
@@ -1299,10 +1321,8 @@
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_PLUSB=m
-# CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_USB_NET_RNDIS_HOST=m
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_IP_DCCP_CCID3=m
 CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_CICADA_PHY=m
 CONFIG_QSEMI_PHY=m
@@ -1321,28 +1341,12 @@
 CONFIG_PPP_MPPE=m
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_RFD_FTL=m
-CONFIG_SCTP_HMAC_MD5=y
-# CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_TELCLOCK=m
 CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
 CONFIG_ATM_DUMMY=m
 CONFIG_SYNCLINK_GT=m
- 
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
-CONFIG_TIPC=m
-CONFIG_TIPC_ADVANCED=y
-CONFIG_TIPC_ZONES=3
-CONFIG_TIPC_CLUSTERS=1
-CONFIG_TIPC_NODES=255
-CONFIG_TIPC_SLAVE_NODES=0
-CONFIG_TIPC_PORTS=8191
-CONFIG_TIPC_LOG=0
-# CONFIG_TIPC_DEBUG is not set
 CONFIG_DEV_APPLETALK=m
-
 CONFIG_USB_UEAGLEATM=m
 CONFIG_TOUCHSCREEN_ADS7846=m
 CONFIG_YENTA_TOSHIBA=y
@@ -1406,14 +1410,12 @@
 CONFIG_GIGASET_M101=m
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_TOIM3232_DONGLE=m
-CONFIG_IP_DCCP_CCID2=m
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_GIGASET_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_SND_ALS300=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_IP_DCCP_ACKVEC=y
 CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_VXPOCKET=m
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -1590,7 +1592,6 @@
 CONFIG_PATA_PCMCIA=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_MMC_TIFM_SD=m
-# CONFIG_NETLABEL is not set
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_PATA_PDC_OLD=m
 CONFIG_EXT4DEV_FS_SECURITY=y
@@ -1618,7 +1619,6 @@
 CONFIG_ATA_GENERIC=m
 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
 CONFIG_USB_USBNET_MII=m
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
 CONFIG_W83697HF_WDT=m
 CONFIG_SLHC=m
 CONFIG_DLM_DEBUG=y
@@ -1644,7 +1644,6 @@
 CONFIG_NET_SCH_FIFO=y
 CONFIG_NETXEN_NIC=m
 CONFIG_PC87413_WDT=m
-CONFIG_IP_DCCP_CCID3_RTO=100
 CONFIG_BROADCOM_PHY=m
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 CONFIG_HID=m
@@ -1654,7 +1653,6 @@
 CONFIG_AC97_BUS=m
 CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_PATA_MARVELL=m
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
 # CONFIG_ITCO_VENDOR_SUPPORT is not set
 CONFIG_WAN_ROUTER_DRIVERS=m
 # CONFIG_FORCEDETH_NAPI is not set

