From: Jiri Pinkava Date: Tue, 25 May 2010 07:48:58 +0000 (+0200) Subject: ARM: SAMSUNG: MMC: fix build error when both DMA and PIO mode selected X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=60c2c0d5658082468b569d039f4d0dc24f92c66b;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git ARM: SAMSUNG: MMC: fix build error when both DMA and PIO mode selected [cjb: fix line-wrapped patch] Signed-off-by: Jiri Pinkava Signed-off-by: Chris Ball Cc: Matt Fleming Cc: Russell King Cc: Ben Dooks Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 2e16e0a90a5e..976330de379e 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -1600,7 +1600,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev) host->pio_active = XFER_NONE; #ifdef CONFIG_MMC_S3C_PIODMA - host->dodma = host->pdata->dma; + host->dodma = host->pdata->use_dma; #endif host->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);