Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-drm-fsl-dcu.git] / block / as-iosched.c

diff --git a/block/as-iosched.c b/block/as-iosched.c
index f371c9359999aa7627be436940ceee1d14c7164e..5934c4bfd52a3d9b71331785ac6fafc26ddef992 100644 (file)
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
@@ -1318,7 +1318,7 @@ static void as_exit_queue(elevator_t *e)
 /*
  * initialize elevator private data (as_data).
  */
-static void *as_init_queue(request_queue_t *q, elevator_t *e)
+static void *as_init_queue(request_queue_t *q)
 {
        struct as_data *ad;