back out 10471 for x86_64 as well

[linux-2.6.git] / planetlab-2.6.22-i586.config

diff --git a/planetlab-2.6.22-i586.config b/planetlab-2.6.22-i586.config
index ee56d69..f7a8796 100644 (file)
--- a/planetlab-2.6.22-i586.config
+++ b/planetlab-2.6.22-i586.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.22-prep
-# Fri Nov 16 15:23:40 2007
+# Thu Feb 28 08:02:09 2008
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -674,7 +674,6 @@ CONFIG_NET_PKTGEN=m
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 
 #
@@ -1260,11 +1259,11 @@ CONFIG_SKFP=m
 # CONFIG_HIPPI is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_FILTER is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPP_DEFLATE is not set
-# CONFIG_PPP_BSDCOMP is not set
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
 # CONFIG_SLIP is not set
@@ -1463,7 +1462,7 @@ CONFIG_NSC_GPIO=m
 CONFIG_CS5535_GPIO=m
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_HPET is not set
-CONFIG_HANGCHECK_TIMER=m
+CONFIG_HANGCHECK_TIMER=y
 
 #
 # TPM devices
@@ -1857,7 +1856,7 @@ CONFIG_QUOTACTL=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
+CONFIG_FUSE_FS=m
 CONFIG_GENERIC_ACL=y
 
 #
@@ -1938,7 +1937,6 @@ CONFIG_RPCSEC_GSS_SPKM3=m
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
 # CONFIG_9P_FS is not set
 
 #
@@ -2017,6 +2015,7 @@ CONFIG_NLS_UTF8=y
 #
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+CONFIG_CHOPSTIX=y
 CONFIG_KPROBES=y
 
 #
@@ -2065,6 +2064,11 @@ CONFIG_4KSTACKS=y
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_DOUBLEFAULT=y
+CONFIG_KDB=y
+CONFIG_KDB_MODULES=m
+CONFIG_KDB_OFF=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+CONFIG_KDB_USB=y
 
 #
 # Linux VServer
@@ -2086,7 +2090,7 @@ CONFIG_TAGGING_ID24=y
 # CONFIG_TAGGING_INTERN is not set
 # CONFIG_TAG_NFSD is not set
 # CONFIG_VSERVER_PRIVACY is not set
-CONFIG_VSERVER_CONTEXTS=256
+CONFIG_VSERVER_CONTEXTS=512
 CONFIG_VSERVER_WARN=y
 # CONFIG_VSERVER_DEBUG is not set
 CONFIG_VSERVER=y