Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / block / Kconfig.iosched

diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index f3b7753aac9940a34e6b6af58f7a7f26762c8b50..48d090e266fc5745be94af97ff8deb32c2726995 100644 (file)
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -40,7 +40,7 @@ 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.