aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>2005-08-10 21:55:36 +0000
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>2005-08-10 21:55:36 +0000
commit3a264694de8d68abc19c1057f49200ec5e6428b4 (patch)
tree53778aa88c932c5c861dad348d635d054c388941
parentb34f79ff69a657aae57e2f1b98ef0fb5d89ec6d0 (diff)
parent7b4525c5aa2675b9040f7b9d513aff4cf7a8c0a7 (diff)
downloadxen-3a264694de8d68abc19c1057f49200ec5e6428b4.tar.gz
xen-3a264694de8d68abc19c1057f49200ec5e6428b4.tar.bz2
xen-3a264694de8d68abc19c1057f49200ec5e6428b4.zip
merge?
-rw-r--r--linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_642
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64 b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64
index 80aba6235e..b06dd5cad5 100644
--- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64
+++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64
@@ -669,7 +669,7 @@ CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
# CONFIG_JBD_DEBUG is not set
CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_FS=y
# CONFIG_REISERFS_CHECK is not set
CONFIG_REISERFS_PROC_INFO=y
CONFIG_REISERFS_FS_XATTR=y