From 461b3c034b82dff7d7ced336aeed61dd0064bf07 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 9 Jun 2011 17:44:13 -0700 Subject: [PATCH] mmc: host: sdhci: Resolve incorrect merge Change-Id: Ic91f35fbb1f0a131d8ab56817f0ad91288c82402 Signed-off-by: Colin Cross --- drivers/mmc/host/sdhci.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 52718cf13e56..a76aaf1debf1 100644 --- 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; -- 2.34.1