Commit 60c2c0d5 authored May 25, 2010 by Jiri Pinkava Committed by Linus Torvalds Sep 09, 2010

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



[cjb: fix line-wrapped patch]
Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
Signed-off-by: Chris 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 5600efb1

drivers/mmc/host/s3cmci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);