back out 10471

[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 d1236c5..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
 
 #