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.2239_FC5 patched with stable patch-2.6.18.2-vs2.0...
[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
309644b
..
50ea265
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
-rc1
-# Mon Nov 13 09:
44:40
2006
+# Linux kernel version: 2.6.18.2
+# Mon Nov 13 09:
31:58
2006
#
CONFIG_X86_32=y
CONFIG_LOCKDEP_SUPPORT=y
#
CONFIG_X86_32=y
CONFIG_LOCKDEP_SUPPORT=y
@@
-1590,8
+1590,8
@@
CONFIG_XEN_BLKDEV_TAP=m
# CONFIG_XEN_TPMDEV_BACKEND is not set
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=m
# CONFIG_XEN_TPMDEV_BACKEND is not set
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_FRAMEBUFFER=y
-CONFIG_XEN_KEYBOARD=y
+# CONFIG_XEN_FRAMEBUFFER is not set
+# CONFIG_XEN_KEYBOARD is not set
CONFIG_XEN_SCRUB_PAGES=y
CONFIG_XEN_DISABLE_SERIAL=y
CONFIG_XEN_SYSFS=y
CONFIG_XEN_SCRUB_PAGES=y
CONFIG_XEN_DISABLE_SERIAL=y
CONFIG_XEN_SYSFS=y