Index: linux-2.6.10-rc2-ck1/drivers/block/elevator.c
===================================================================
--- linux-2.6.10-rc2-ck1.orig/drivers/block/elevator.c	2004-11-15 19:37:27.000000000 +1100
+++ linux-2.6.10-rc2-ck1/drivers/block/elevator.c	2004-11-15 21:36:20.776722251 +1100
@@ -159,12 +159,12 @@ static void elevator_setup_default(void)
 	if (chosen_elevator[0] && elevator_find(chosen_elevator))
 		return;
 
-#if defined(CONFIG_IOSCHED_AS)
+#if defined(CONFIG_IOSCHED_CFQ)
+	strcpy(chosen_elevator, "cfq");
+#elif defined(CONFIG_IOSCHED_AS)
 	strcpy(chosen_elevator, "anticipatory");
 #elif defined(CONFIG_IOSCHED_DEADLINE)
 	strcpy(chosen_elevator, "deadline");
-#elif defined(CONFIG_IOSCHED_CFQ)
-	strcpy(chosen_elevator, "cfq");
 #elif defined(CONFIG_IOSCHED_NOOP)
 	strcpy(chosen_elevator, "noop");
 #else