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.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[linux-2.6.git]
/
configs
/
kernel-2.6.18-i686-xenU.config
diff --git
a/configs/kernel-2.6.18-i686-xenU.config
b/configs/kernel-2.6.18-i686-xenU.config
index
50ea265
..
b601154
100644
(file)
--- a/
configs/kernel-2.6.18-i686-xenU.config
+++ b/
configs/kernel-2.6.18-i686-xenU.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:58
2006
+# Linux kernel version: 2.6.18.
5
+#
Wed Dec 13 17:11:32
2006
#
CONFIG_X86_32=y
CONFIG_LOCKDEP_SUPPORT=y
#
CONFIG_X86_32=y
CONFIG_LOCKDEP_SUPPORT=y
@@
-77,12
+77,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
#
@@
-1094,7
+1088,6
@@
CONFIG_HANGCHECK_TIMER=m
# Multimedia devices
#
# CONFIG_VIDEO_DEV is not set
# Multimedia devices
#
# CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
#
# Digital Video Broadcasting Devices
#
# Digital Video Broadcasting Devices