Diff

diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.cindex 65210fc..5acbe65 100644--- a/drivers/mmc/host/pxamci.c+++ b/drivers/mmc/host/pxamci.c@@ -416,10 +416,7 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 			host->cmdat |= CMDAT_INIT; 	} -	if (ios->bus_width == MMC_BUS_WIDTH_4)-		host->cmdat |= CMDAT_SD_4DAT;-	else-		host->cmdat &= ~CMDAT_SD_4DAT;+	host->cmdat &= ~CMDAT_SD_4DAT;  	pr_debug("PXAMCI: clkrt = %x cmdat = %x\n", 		 host->clkrt, host->cmdat);@@ -539,7 +536,7 @@ static int pxamci_probe(struct platform_device *pdev) 	mmc->caps = 0; 	host->cmdat = 0; 	if (!cpu_is_pxa21x() && !cpu_is_pxa25x()) {-		mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;+		mmc->caps |= MMC_CAP_SDIO_IRQ; 		host->cmdat |= CMDAT_SDIO_INT_EN; 		if (cpu_is_pxa300() || cpu_is_pxa310()) 			mmc->caps |= MMC_CAP_MMC_HIGHSPEED |