diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-09-14 16:15:29 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-09-14 16:15:29 +0200 |
commit | f3fbba6efbab93b9850821d41a75b02286d18315 (patch) | |
tree | e2a680674d334c6e455d1a89a4dbfc3f549cb6d1 /drivers/mmc/host/s3cmci.c | |
parent | 15c5ab607045e278ebf4d2ca4aea2250617d50ca (diff) | |
parent | 147fcf1c211f1a87bf4d0711b7e9637f3d6ce080 (diff) |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/mmc/host/s3cmci.c')
-rw-r--r-- | drivers/mmc/host/s3cmci.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |