summaryrefslogtreecommitdiff
path: root/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2008-02-13 10:55:47 +0000
committerFlorian Boor <florian.boor@kernelconcepts.de>2008-02-13 10:55:47 +0000
commit0f0344845902edcbfed4d1bfc4996210f793a947 (patch)
tree99171617514dfbcfb7dd17033ca4f3248d79dd46 /packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
parent5cf7c1a4e24bc8e031ecd57b04682f3d1d698052 (diff)
parent32e690935379493f478d1b7a1cd43fce486083da (diff)
merge of '6828c0e5742385a5f78150f5504e1690ea6c4111'
and 'f26d3059129388297f1542283ce17d100f8c8acc'
Diffstat (limited to 'packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig')
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig14
1 files changed, 7 insertions, 7 deletions
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
index b7c9c46845..25982ed5a8 100644
--- a/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Sun Feb 10 21:02:26 2008
+# Tue Feb 12 22:00:47 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -96,14 +96,14 @@ CONFIG_BLOCK=y
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
#
# System Type