Merge branch 'request-queue-t' of git://git.kernel.dk/linux-2.6-block

* 'request-queue-t' of git://git.kernel.dk/linux-2.6-block:
  [BLOCK] Add request_queue_t and mark it deprecated
  [BLOCK] Get rid of request_queue_t typedef

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index 28ac632b42dd..dcb729244f47 100644
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -227,7 +227,7 @@ struct mddev_s
         unsigned int                    safemode_delay;
         struct timer_list               safemode_timer;
         atomic_t                        writes_pending; 
-        request_queue_t                 *queue; /* for plugging ... */
+        struct request_queue            *queue; /* for plugging ... */
 
         atomic_t                        write_behind; /* outstanding async IO */
         unsigned int                    max_write_behind; /* 0 = sync */
@@ -265,7 +265,7 @@ struct mdk_personality
         int level;
         struct list_head list;
         struct module *owner;
-        int (*make_request)(request_queue_t *q, struct bio *bio);
+        int (*make_request)(struct request_queue *q, struct bio *bio);
         int (*run)(mddev_t *mddev);
         int (*stop)(mddev_t *mddev);
         void (*status)(struct seq_file *seq, mddev_t *mddev);