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
BLT -> MOD : CONFIG_IOSCHED_AS
[linux-2.6.git]
/
configs
/
kernel-2.6.18-i586-planetlab.config
diff --git
a/configs/kernel-2.6.18-i586-planetlab.config
b/configs/kernel-2.6.18-i586-planetlab.config
index
2055690
..
8d4436a
100644
(file)
--- a/
configs/kernel-2.6.18-i586-planetlab.config
+++ b/
configs/kernel-2.6.18-i586-planetlab.config
@@
-1,7
+1,7
@@
#
# Automatically generated make config: don't edit
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-1.2239_FC5.1
-# Fri Dec 1
03:00:55
2006
+# Linux kernel version: 2.6.18-1.2239_FC5.1
smp
+# Fri Dec 1
16:23:54
2006
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@
-91,8
+91,8
@@
CONFIG_LSF=y
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=
y
-CONFIG_IOSCHED_DEADLINE=
y
+CONFIG_IOSCHED_AS=
m
+CONFIG_IOSCHED_DEADLINE=
m
CONFIG_IOSCHED_CFQ=y
# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_IOSCHED_CFQ=y
# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
@@
-271,7
+271,6
@@
CONFIG_ISA_DMA_API=y
# CONFIG_ISA is not set
# CONFIG_MCA is not set
# CONFIG_SCx200 is not set
# CONFIG_ISA is not set
# CONFIG_MCA is not set
# CONFIG_SCx200 is not set
-CONFIG_K8_NB=y
#
# PCCARD (PCMCIA/CardBus) support
#
# PCCARD (PCMCIA/CardBus) support
@@
-1105,17
+1104,7
@@
CONFIG_HW_RANDOM_VIA=y
# Ftape, the floppy tape device driver
#
# CONFIG_FTAPE is not set
# Ftape, the floppy tape device driver
#
# CONFIG_FTAPE is not set
-CONFIG_AGP=m
-CONFIG_AGP_ALI=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_SWORKS=m
-CONFIG_AGP_VIA=m
-CONFIG_AGP_EFFICEON=m
+# CONFIG_AGP is not set
# CONFIG_DRM is not set
# CONFIG_MWAVE is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_DRM is not set
# CONFIG_MWAVE is not set
# CONFIG_PC8736x_GPIO is not set
@@
-1725,7
+1714,7
@@
CONFIG_CRYPTO_CRC32C=m
# Library routines
#
CONFIG_CRC_CCITT=m
# Library routines
#
CONFIG_CRC_CCITT=m
-# CONFIG_CRC16 is not set
+CONFIG_CRC16=m
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y