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-i586.config
diff --git
a/configs/kernel-2.6.18-i586.config
b/configs/kernel-2.6.18-i586.config
index
f47689d
..
4bb100b
100644
(file)
--- a/
configs/kernel-2.6.18-i586.config
+++ b/
configs/kernel-2.6.18-i586.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.
5
+#
Wed Dec 13 17:11:31
2006
#
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
#
@@
-2019,7
+2013,7
@@
CONFIG_RTC=y
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
-# CONFIG_SONYPI is not set
+CONFIG_SONYPI=m
#
# Ftape, the floppy tape device driver
#
# Ftape, the floppy tape device driver
@@
-2234,6
+2228,7
@@
CONFIG_VIDEO_ZORAN_DC30=m
CONFIG_VIDEO_ZORAN_LML33=m
CONFIG_VIDEO_ZORAN_LML33R10=m
CONFIG_VIDEO_ZORAN_AVS6EYES=m
CONFIG_VIDEO_ZORAN_LML33=m
CONFIG_VIDEO_ZORAN_LML33R10=m
CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_MEYE=m
CONFIG_VIDEO_SAA7134=m
CONFIG_VIDEO_SAA7134_ALSA=m
CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_SAA7134=m
CONFIG_VIDEO_SAA7134_ALSA=m
CONFIG_VIDEO_SAA7134_DVB=m