Commit 60c2c0d5 authored by Jiri Pinkava's avatar Jiri Pinkava Committed by Linus Torvalds

ARM: SAMSUNG: MMC: fix build error when both DMA and PIO mode selected

[cjb: fix line-wrapped patch]
Signed-off-by: default avatarJiri Pinkava <jiri.pinkava@vscht.cz>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
Cc: Matt Fleming <matt@console-pimps.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5600efb1
...@@ -1600,7 +1600,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev) ...@@ -1600,7 +1600,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
host->pio_active = XFER_NONE; host->pio_active = XFER_NONE;
#ifdef CONFIG_MMC_S3C_PIODMA #ifdef CONFIG_MMC_S3C_PIODMA
host->dodma = host->pdata->dma; host->dodma = host->pdata->use_dma;
#endif #endif
host->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); host->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment