diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-10-10 11:30:59 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-10-10 11:30:59 +0200 |
commit | 151aeab77738469ddbf0f9532e2fddd0d231aa2b (patch) | |
tree | cb1320931d458aeecd1d504575c62ad554a3417a /drivers/mmc/host/pxamci.c | |
parent | 17de4ee04ca925590df036b112c1db8a778e14bf (diff) | |
parent | 024c9d2faebdad3fb43fe49ad68e91a36190f1e2 (diff) |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/mmc/host/pxamci.c')
-rw-r--r-- | drivers/mmc/host/pxamci.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 59ab194cb009..c763b404510f 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -702,11 +702,7 @@ static int pxamci_probe(struct platform_device *pdev) pxamci_init_ocr(host); - /* - * This architecture used to disable bounce buffers through its - * defconfig, now it is done at runtime as a host property. - */ - mmc->caps = MMC_CAP_NO_BOUNCE_BUFF; + mmc->caps = 0; host->cmdat = 0; if (!cpu_is_pxa25x()) { mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ; |