Auto-update from upstream

[linux-2.6] / block / Kconfig.iosched

diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index 5b90d2fa63b8382d80de600d0410e4a1cf0518e2..48d090e266fc5745be94af97ff8deb32c2726995 100644 (file)
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -40,19 +40,19 @@ config IOSCHED_CFQ
 
 choice
        prompt "Default I/O scheduler"
-       default DEFAULT_AS
+       default DEFAULT_CFQ
        help
          Select the I/O scheduler which will be used by default for all
          block devices.
 
        config DEFAULT_AS
-               bool "Anticipatory" if IOSCHED_AS
+               bool "Anticipatory" if IOSCHED_AS=y
 
        config DEFAULT_DEADLINE
-               bool "Deadline" if IOSCHED_DEADLINE
+               bool "Deadline" if IOSCHED_DEADLINE=y
 
        config DEFAULT_CFQ
-               bool "CFQ" if IOSCHED_CFQ
+               bool "CFQ" if IOSCHED_CFQ=y
 
        config DEFAULT_NOOP
                bool "No-op"