| commit | 60c2c0d5658082468b569d039f4d0dc24f92c66b | [log] [tgz] |
|---|---|---|
| author | Jiri Pinkava <[email protected]> | Tue May 25 09:48:58 2010 +0200 |
| committer | Linus Torvalds <[email protected]> | Thu Sep 09 18:57:23 2010 -0700 |
| tree | 78c53d1de3b0339a9356f3ebbe6d7f76e20f5801 | |
| parent | 5600efb1bc2745d93ae0bc08130117a84f2b9d69 [diff] |
ARM: SAMSUNG: MMC: fix build error when both DMA and PIO mode selected [cjb: fix line-wrapped patch] Signed-off-by: Jiri Pinkava <[email protected]> Signed-off-by: Chris Ball <[email protected]> Cc: Matt Fleming <[email protected]> Cc: Russell King <[email protected]> Cc: Ben Dooks <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 2e16e0a..976330d 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c
@@ -1600,7 +1600,7 @@ 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);