Revert "usb: dwc3: turn off VBUS when leaving host mode"

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / block / Kconfig.iosched

diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index af3d6a3..4cd7ea3 100644 (file)
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -50,6 +50,17 @@ config CFQ_GROUP_IOSCHED
        ---help---
          Enable group IO scheduling in CFQ.
 
+config IOSCHED_ZEN
+       tristate "Zen I/O scheduler"
+       default y
+       ---help---
+       FCFS, dispatches are back-inserted, deadlines ensure fairness.
+        Should work best with devices where there is no travel delay.
+
+config IOSCHED_MAPLE
+       tristate "Maple I/O scheduler"
+       default y
+
 choice
        prompt "Default I/O scheduler"
        default DEFAULT_CFQ
@@ -63,6 +74,12 @@ choice
        config DEFAULT_CFQ
                bool "CFQ" if IOSCHED_CFQ=y
 
+       config DEFAULT_ZEN
+               bool "ZEN" if IOSCHED_ZEN=y
+
+       config DEFAULT_MAPLE
+               bool "Maple" if IOSCHED_MAPLE=y
+
        config DEFAULT_NOOP
                bool "No-op"
 
@@ -72,6 +89,8 @@ config DEFAULT_IOSCHED
        string
        default "deadline" if DEFAULT_DEADLINE
        default "cfq" if DEFAULT_CFQ
+       default "zen" if DEFAULT_ZEN
+       default "maple" if DEFAULT_MAPLE
        default "noop" if DEFAULT_NOOP
 
 endmenu