The previous commit lost a hunk that I checked in in the one before that. The two...

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

diff --git a/planetlab-2.6.22-i686.config b/planetlab-2.6.22-i686.config
index 3883b7a..cbcf5ff 100644 (file)
--- a/planetlab-2.6.22-i686.config
+++ b/planetlab-2.6.22-i686.config
@@ -1468,7 +1468,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
@@ -1862,7 +1862,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
 
 #
@@ -2083,7 +2083,7 @@ CONFIG_KDB_USB=y
 CONFIG_VSERVER_FILESHARING=y
 # CONFIG_VSERVER_AUTO_LBACK is not set
 # CONFIG_VSERVER_AUTO_SINGLE is not set
-# CONFIG_VSERVER_COWBL is not set
+CONFIG_VSERVER_COWBL=y
 # CONFIG_VSERVER_VTIME is not set
 # CONFIG_VSERVER_DEVICE is not set
 # CONFIG_VSERVER_PROC_SECURE is not set
@@ -2097,7 +2097,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