summaryrefslogtreecommitdiff
path: root/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-02-13 11:15:20 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-02-13 11:15:20 +0000
commit784e9e1768bfef0341ec13b7d17b32d98dafaef3 (patch)
tree42aeafee932d81641e82de922bcdc71b66e9f5b8 /packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal
parent403333e2d7c0ff87a0a449d7f2d014d941a20d8a (diff)
parent32e690935379493f478d1b7a1cd43fce486083da (diff)
merge of '054216fcb27d4211cd8948d7407878afe1bbf15c'
and 'f26d3059129388297f1542283ce17d100f8c8acc'
Diffstat (limited to 'packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal')
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig14
1 files changed, 7 insertions, 7 deletions
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
index eb4d556fa0..060ec46886 100644
--- a/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Sun Feb 10 21:02:27 2008
+# Tue Feb 12 22:00:48 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