diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-18 18:10:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-18 18:10:29 -0400 |
| commit | 413427b5679f7bb9f25548c498ae92bb03e34443 (patch) | |
| tree | eae7e551852b85f4b746e1adfd69acd5b378e331 /drivers/mmc/host/s3cmci.c | |
| parent | 187f81b3d8d315c35c73ac0d05b15a04a0ac3ce7 (diff) | |
| parent | 9f01efaa49070acfcfa4b976345054cc27b172ed (diff) | |
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
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 4eb4f37544ab..8c08cd7efa7f 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, | |||
| 794 | host->mem->start + host->sdidata); | 794 | host->mem->start + host->sdidata); |
| 795 | 795 | ||
| 796 | if (!setup_ok) { | 796 | if (!setup_ok) { |
| 797 | s3c2410_dma_config(host->dma, 4, 0); | 797 | s3c2410_dma_config(host->dma, 4); |
| 798 | s3c2410_dma_set_buffdone_fn(host->dma, | 798 | s3c2410_dma_set_buffdone_fn(host->dma, |
| 799 | s3cmci_dma_done_callback); | 799 | s3cmci_dma_done_callback); |
| 800 | s3c2410_dma_setflags(host->dma, S3C2410_DMAF_AUTOSTART); | 800 | s3c2410_dma_setflags(host->dma, S3C2410_DMAF_AUTOSTART); |