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-kdump.config
diff --git
a/configs/kernel-2.6.18-i686-kdump.config
b/configs/kernel-2.6.18-i686-kdump.config
index
d42285d
..
0d63573
100644
(file)
--- a/
configs/kernel-2.6.18-i686-kdump.config
+++ b/
configs/kernel-2.6.18-i686-kdump.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
-#
Mon Nov 13 09:31:57 2006
+# Linux kernel version: 2.6.18.
6
+#
Wed Jan 3 21:45:29 2007
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@
-76,12
+76,6
@@
CONFIG_MODULE_SIG=y
# CONFIG_MODULE_SIG_FORCE is not set
CONFIG_KMOD=y
# CONFIG_MODULE_SIG_FORCE is not set
CONFIG_KMOD=y
-#
-# Process debugging support
-#
-CONFIG_UTRACE=y
-CONFIG_PTRACE=y
-
#
# Block layer
#
#
# Block layer
#
@@
-162,7
+156,6
@@
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_X86_UP_APIC=y
CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_UP_APIC=y
CONFIG_X86_UP_IOAPIC=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
@@
-1928,7
+1921,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