1 files changed, 2 insertions, 8 deletions

diff --git a/block/elevator.c b/block/elevator.c
index 1975b619c86d..bb30f0e92d4d 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -154,10 +154,7 @@ static struct elevator_type *elevator_get(const char *name)
 
                 spin_unlock(&elv_list_lock);
 
-                if (!strcmp(name, "anticipatory"))
-                        sprintf(elv, "as-iosched");
-                else
-                        sprintf(elv, "%s-iosched", name);
+                sprintf(elv, "%s-iosched", name);
 
                 request_module("%s", elv);
                 spin_lock(&elv_list_lock);
@@ -193,10 +190,7 @@ static int __init elevator_setup(char *str)
          * Be backwards-compatible with previous kernels, so users
          * won't get the wrong elevator.
          */
-        if (!strcmp(str, "as"))
-                strcpy(chosen_elevator, "anticipatory");
-        else
-                strncpy(chosen_elevator, str, sizeof(chosen_elevator) - 1);
+        strncpy(chosen_elevator, str, sizeof(chosen_elevator) - 1);
         return 1;
 }