Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[~andy/linux] / drivers / mmc / card / queue.h

diff --git a/drivers/mmc/card/queue.h b/drivers/mmc/card/queue.h
index c1a69ac6fff054da3c52791e1b5348d822a94558..d2a1eb4b9f9fade36848726f4e36fc4db1463cca 100644 (file)
--- a/drivers/mmc/card/queue.h
+++ b/drivers/mmc/card/queue.h
@@ -19,6 +19,7 @@ struct mmc_queue_req {
        char                    *bounce_buf;
        struct scatterlist      *bounce_sg;
        unsigned int            bounce_sg_len;
+       struct mmc_async_req    mmc_active;
 };
 
 struct mmc_queue {
@@ -29,8 +30,9 @@ struct mmc_queue {
        int                     (*issue_fn)(struct mmc_queue *, struct request *);
        void                    *data;
        struct request_queue    *queue;
-       struct mmc_queue_req    mqrq[1];
+       struct mmc_queue_req    mqrq[2];
        struct mmc_queue_req    *mqrq_cur;
+       struct mmc_queue_req    *mqrq_prev;
 };
 
 extern int mmc_init_queue(struct mmc_queue *, struct mmc_card *, spinlock_t *,