diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /drivers/mmc/card/queue.c | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'drivers/mmc/card/queue.c')
| -rw-r--r-- | drivers/mmc/card/queue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index 406989e992ba..7a72e75d5c67 100644 --- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c | |||
| @@ -132,6 +132,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock | |||
| 132 | 132 | ||
| 133 | blk_queue_prep_rq(mq->queue, mmc_prep_request); | 133 | blk_queue_prep_rq(mq->queue, mmc_prep_request); |
| 134 | blk_queue_ordered(mq->queue, QUEUE_ORDERED_DRAIN, NULL); | 134 | blk_queue_ordered(mq->queue, QUEUE_ORDERED_DRAIN, NULL); |
| 135 | queue_flag_set_unlocked(QUEUE_FLAG_NONROT, mq->queue); | ||
| 135 | 136 | ||
| 136 | #ifdef CONFIG_MMC_BLOCK_BOUNCE | 137 | #ifdef CONFIG_MMC_BLOCK_BOUNCE |
| 137 | if (host->max_hw_segs == 1) { | 138 | if (host->max_hw_segs == 1) { |