summaryrefslogtreecommitdiff
path: root/packages/linux/linux-handhelds-2.6-2.6.21/htcapache
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2008-02-13 10:00:30 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2008-02-13 10:00:30 +0000
commit32e690935379493f478d1b7a1cd43fce486083da (patch)
treed106204a94b498e0851f8c84137b46db3782e8ec /packages/linux/linux-handhelds-2.6-2.6.21/htcapache
parent7cd0c7e0f2000211f05791518f38a3d017beffec (diff)
parent89dccbe47302c430477b871dda48313c1ebe94e6 (diff)
merge of '0f81044fe7f22c4e80b9e840c9f9f4c6a6e8d1a2'
and '16ce3628a1d3a9a9700cc501a3cb77666ed8c4a0'
Diffstat (limited to 'packages/linux/linux-handhelds-2.6-2.6.21/htcapache')
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig14
1 files changed, 7 insertions, 7 deletions
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
index 67f0e76bf0..4f90d2c2e8 100644
--- a/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Sun Feb 10 21:02:24 2008
+# Tue Feb 12 22:00:45 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