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.2257_FC5 patched with stable patch-2.6.18.5-vs2.0...
[linux-2.6.git]
/
configs
/
kernel-2.6.18-i586-smp.config
diff --git
a/configs/kernel-2.6.18-i586-smp.config
b/configs/kernel-2.6.18-i586-smp.config
index
224fc97
..
7031af6
100644
(file)
--- a/
configs/kernel-2.6.18-i586-smp.config
+++ b/
configs/kernel-2.6.18-i586-smp.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.
2-rc1
-#
Mon Nov 13 09:44:39
2006
+# Linux kernel version: 2.6.18.
6-rc2
+#
Tue Dec 26 19:31:26
2006
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@
-78,12
+78,6
@@
CONFIG_MODULE_SIG=y
CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y
CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y
-#
-# Process debugging support
-#
-CONFIG_UTRACE=y
-CONFIG_PTRACE=y
-
#
# Block layer
#
#
# Block layer
#
@@
-165,7
+159,6
@@
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
CONFIG_PREEMPT_BKL=y
CONFIG_X86_LOCAL_APIC=y
# CONFIG_PREEMPT is not set
CONFIG_PREEMPT_BKL=y
CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_APIC_AUTO=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_MCE=y
# CONFIG_X86_MCE_NONFATAL is not set
CONFIG_X86_IO_APIC=y
CONFIG_X86_MCE=y
# CONFIG_X86_MCE_NONFATAL is not set
@@
-212,9
+205,9
@@
CONFIG_BOOT_IOREMAP=y
CONFIG_REGPARM=y
# CONFIG_SECCOMP is not set
# CONFIG_HZ_100 is not set
CONFIG_REGPARM=y
# CONFIG_SECCOMP is not set
# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=
25
0
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=
100
0
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x400000
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x400000
@@
-3104,10
+3097,6
@@
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