summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-18 23:10:29 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-18 23:10:29 +0100
commit413427b5679f7bb9f25548c498ae92bb03e34443 (patch)
treeeae7e551852b85f4b746e1adfd69acd5b378e331 /drivers
parent187f81b3d8d315c35c73ac0d05b15a04a0ac3ce7 (diff)
parent9f01efaa49070acfcfa4b976345054cc27b172ed (diff)
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/s3cmci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 4eb4f37544a..8c08cd7efa7 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -794,7 +794,7 @@ static void s3cmci_dma_setup(struct s3cmci_host *host,
host->mem->start + host->sdidata);
if (!setup_ok) {
- s3c2410_dma_config(host->dma, 4, 0);
+ s3c2410_dma_config(host->dma, 4);
s3c2410_dma_set_buffdone_fn(host->dma,
s3cmci_dma_done_callback);
s3c2410_dma_setflags(host->dma, S3C2410_DMAF_AUTOSTART);