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-ia64-xen.config
diff --git
a/configs/kernel-2.6.18-ia64-xen.config
b/configs/kernel-2.6.18-ia64-xen.config
index
f701d61
..
339709b
100644
(file)
--- a/
configs/kernel-2.6.18-ia64-xen.config
+++ b/
configs/kernel-2.6.18-ia64-xen.config
@@
-1,8
+1,8
@@
# ia64
#
# Automatically generated make config: don't edit
# ia64
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18.
2
-#
Mon Nov 13 09:31:59
2006
+# Linux kernel version: 2.6.18.
6
+#
Thu Dec 28 22:01:24
2006
#
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@
-65,12
+65,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
#
@@
-1551,7
+1545,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