git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2260_FC5 patched with stable patch-2.6.18.5-vs2.0...
[linux-2.6.git]
/
configs
/
kernel-2.6.18-i686-xen0.config
diff --git
a/configs/kernel-2.6.18-i686-xen0.config
b/configs/kernel-2.6.18-i686-xen0.config
index
1643872
..
c37defd
100644
(file)
--- a/
configs/kernel-2.6.18-i686-xen0.config
+++ b/
configs/kernel-2.6.18-i686-xen0.config
@@
-1,8
+1,8
@@
# i386
#
# Automatically generated make config: don't edit
# i386
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18.6
-rc2
-# T
ue Dec 26 19:31:28
2006
+# Linux kernel version: 2.6.18.6
+# T
hu Dec 28 22:01:23
2006
#
CONFIG_X86_32=y
CONFIG_LOCKDEP_SUPPORT=y
#
CONFIG_X86_32=y
CONFIG_LOCKDEP_SUPPORT=y
@@
-1792,7
+1792,7
@@
CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_SERIAL_NONSTANDARD=y
# CONFIG_COMPUTONE is not set
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_SERIAL_NONSTANDARD=y
# CONFIG_COMPUTONE is not set
-# CONFIG_ROCKETPORT is not set
+CONFIG_ROCKETPORT=m
CONFIG_CYCLADES=m
# CONFIG_CYZ_INTR is not set
# CONFIG_DIGIEPCA is not set
CONFIG_CYCLADES=m
# CONFIG_CYZ_INTR is not set
# CONFIG_DIGIEPCA is not set
@@
-2932,6
+2932,10
@@
CONFIG_JFFS2_ZLIB=y
CONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
CONFIG_CRAMFS=m
CONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_VMALLOC is not set
CONFIG_VXFS_FS=m
# CONFIG_HPFS_FS is not set
CONFIG_QNX4FS_FS=m
CONFIG_VXFS_FS=m
# CONFIG_HPFS_FS is not set
CONFIG_QNX4FS_FS=m