3 files changed, 6 insertions, 5 deletions

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 45bcf098e762..f540bd88dc5a 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -21,7 +21,7 @@ config MMC_DEBUG
 
 config MMC_BLOCK
         tristate "MMC block device driver"
-        depends on MMC
+        depends on MMC && BLOCK
         default y
         help
           Say Y here to enable the MMC block device driver support.
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index d2957e35cc6f..b1f6e03e7aa9 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -24,7 +24,8 @@ obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o
 obj-$(CONFIG_MMC_OMAP)          += omap.o
 obj-$(CONFIG_MMC_AT91RM9200)    += at91_mci.o
 
-mmc_core-y := mmc.o mmc_queue.o mmc_sysfs.o
+mmc_core-y := mmc.o mmc_sysfs.o
+mmc_core-$(CONFIG_BLOCK) += mmc_queue.o
 
 ifeq ($(CONFIG_MMC_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/mmc/mmc_queue.c b/drivers/mmc/mmc_queue.c
index 74f8cdeeff0f..4ccdd82b680f 100644
--- a/drivers/mmc/mmc_queue.c
+++ b/drivers/mmc/mmc_queue.c
@@ -28,7 +28,7 @@ static int mmc_prep_request(struct request_queue *q, struct request *req)
         struct mmc_queue *mq = q->queuedata;
         int ret = BLKPREP_KILL;
 
-        if (req->flags & REQ_SPECIAL) {
+        if (blk_special_request(req)) {
                 /*
                  * Special commands already have the command
                  * blocks already setup in req->special.
@@ -36,7 +36,7 @@ static int mmc_prep_request(struct request_queue *q, struct request *req)
                 BUG_ON(!req->special);
 
                 ret = BLKPREP_OK;
-        } else if (req->flags & (REQ_CMD | REQ_BLOCK_PC)) {
+        } else if (blk_fs_request(req) || blk_pc_request(req)) {
                 /*
                  * Block I/O requests need translating according
                  * to the protocol.
@@ -50,7 +50,7 @@ static int mmc_prep_request(struct request_queue *q, struct request *req)
         }
 
         if (ret == BLKPREP_OK)
-                req->flags |= REQ_DONTPREP;
+                req->cmd_flags |= REQ_DONTPREP;
 
         return ret;
 }