From c8b3f1fe1c5c411fe00560bb2f8a352d9f31da42 Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Thu, 21 Feb 2019 11:18:32 +0800 Subject: [PATCH] mmc: block: add dependency of emmc_disk flag Rockchip platform now not only use dw_mmc but also the sdhci-of-arasan could be used as emmc. So we need to add its dependency when setting emmc_disk flag. Change-Id: I84f99657b874a15e60063b1b4ff94fd90cc191c3 Signed-off-by: Shawn Lin --- drivers/mmc/core/block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 2ab2eb6809e0..f9248621ed27 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -2944,14 +2944,14 @@ static int mmc_blk_probe(struct mmc_card *card) dev_set_drvdata(&card->dev, md); - #if defined(CONFIG_MMC_DW_ROCKCHIP) +#if defined(CONFIG_MMC_DW_ROCKCHIP) || defined(CONFIG_MMC_SDHCI_OF_ARASAN) if (card->host->restrict_caps & RESTRICT_CARD_TYPE_EMMC) { this_card = card; md->disk->emmc_disk = 1; } else { md->disk->emmc_disk = 0; } - #endif +#endif if (mmc_add_disk(md)) goto out;