mmc: host: sdhci: Resolve incorrect merge

Change-Id: Ic91f35fbb1f0a131d8ab56817f0ad91288c82402
Signed-off-by: Colin Cross <ccross@android.com>

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 52718cf13e56bed006e7fcfada84d0374a99047c..a76aaf1debf1244cc41633f5b8fd8b8821c897ad 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1861,8 +1861,6 @@ int sdhci_add_host(struct sdhci_host *host)
                mmc_set_disable_delay(mmc, 50);
        }
 
-       mmc->caps |= MMC_CAP_ERASE;
-
        mmc->ocr_avail = 0;
        if (caps & SDHCI_CAN_VDD_330)
                mmc->ocr_avail |= MMC_VDD_32_33|MMC_VDD_33_34;