Index: linux-2.6.8-rc1/drivers/block/ll_rw_blk.c
===================================================================
--- linux-2.6.8-rc1.orig/drivers/block/ll_rw_blk.c	2004-07-15 02:41:38.000000000 +1000
+++ linux-2.6.8-rc1/drivers/block/ll_rw_blk.c	2004-07-15 10:03:13.182329822 +1000
@@ -1360,12 +1360,12 @@
 static int __make_request(request_queue_t *, struct bio *);
 
 static elevator_t *chosen_elevator =
-#if defined(CONFIG_IOSCHED_AS)
+#if defined(CONFIG_IOSCHED_CFQ)
+	&iosched_cfq;
+#elif defined(CONFIG_IOSCHED_AS)
 	&iosched_as;
 #elif defined(CONFIG_IOSCHED_DEADLINE)
 	&iosched_deadline;
-#elif defined(CONFIG_IOSCHED_CFQ)
-	&iosched_cfq;
 #elif defined(CONFIG_IOSCHED_NOOP)
 	&elevator_noop;
 #else