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

[Maximilian Attems]

Author: maks
Date: Mon Jun  4 14:28:27 2007
New Revision: 8898

Log:
order networking options, 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	Mon Jun  4 14:28:27 2007
@@ -122,6 +122,7 @@
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
@@ -133,15 +134,10 @@
 CONFIG_IP_FIB_HASH=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_MULTIPATH_RR=m
-CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
-CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m
-CONFIG_IP_ROUTE_MULTIPATH_DRR=m
+# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
 CONFIG_IP_ROUTE_VERBOSE=y
 # CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_IP_MROUTE=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
@@ -152,8 +148,11 @@
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=y
 CONFIG_TCP_CONG_CUBIC=m
@@ -173,10 +172,8 @@
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="bic"
 # CONFIG_TCP_MD5SIG is not set
-
-#
-# IP: Virtual Server Configuration
-#
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
 CONFIG_IP_VS_TAB_BITS=12
@@ -686,7 +683,6 @@
 # CONFIG_TCG_TPM is not set
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_NSC=m
-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
 CONFIG_SERIAL_8250_ACCENT=m
 CONFIG_NFSD_V2_ACL=y
 CONFIG_I2O_EXT_ADAPTEC=y
@@ -1269,7 +1265,6 @@
 CONFIG_IP_DCCP_TFRC_LIB=m
 CONFIG_SIS190=m
 CONFIG_SND_AD1889=m
-CONFIG_INET_TCP_DIAG=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_DAVICOM_PHY=m
 CONFIG_USB_NET_CDC_SUBSET=m
@@ -1405,7 +1400,6 @@
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_DMA_ENGINE=y
 # CONFIG_UFS_DEBUG is not set
-CONFIG_INET_XFRM_MODE_TUNNEL=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_SND_INDIGOIO=m
 # CONFIG_FIXED_MII_10_FDX is not set
@@ -1427,7 +1421,6 @@
 CONFIG_INOTIFY_USER=y
 CONFIG_ACPI_DOCK=m
 CONFIG_SMSC_PHY=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_USB_QUICKCAM_MESSENGER=m
 CONFIG_OCFS2_DEBUG_MASKLOG=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
@@ -1618,7 +1611,6 @@
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_USB_MIDI_GADGET=m
 CONFIG_GFS2_FS=m
-# CONFIG_XFRM_SUB_POLICY is not set
 CONFIG_HDLC=m
 CONFIG_HDLC_RAW=m
 CONFIG_HDLC_RAW_ETH=m
@@ -1647,3 +1639,7 @@
 # CONFIG_ITCO_VENDOR_SUPPORT is not set
 CONFIG_WAN_ROUTER_DRIVERS=m
 # CONFIG_FORCEDETH_NAPI is not set
+CONFIG_IP_ROUTE_MULTIPATH_RR=m
+CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
+CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m
+CONFIG_IP_ROUTE_MULTIPATH_DRR=m