From 16aada747c60b24802e9a89e1679ab7f8b1913b8 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben@simtec.co.uk>
Date: Thu, 12 Mar 2009 14:31:33 -0700
Subject: [PATCH] --- yaml --- r: 132227 b: refs/heads/master c:
 7c48ed3383bfb2106694807361ec187fe8a4333d h: refs/heads/master i:   132225:
 90456f2237325d597fe1eb55023ab97a5b862715   132223:
 e633ec4175cef2481c802ee96df6ae2b8be4f771 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mmc/host/s3cmci.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0b307a16ad13..242e2b0e89da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b53dc74ef957f134d93e989150f983e92fb88e3
+refs/heads/master: 7c48ed3383bfb2106694807361ec187fe8a4333d
diff --git a/trunk/drivers/mmc/host/s3cmci.c b/trunk/drivers/mmc/host/s3cmci.c
index f4a67c65d301..2db166b7096f 100644
--- a/trunk/drivers/mmc/host/s3cmci.c
+++ b/trunk/drivers/mmc/host/s3cmci.c
@@ -793,8 +793,7 @@ static void s3cmci_dma_setup(struct s3cmci_host *host,
 			      host->mem->start + host->sdidata);
 
 	if (!setup_ok) {
-		s3c2410_dma_config(host->dma, 4,
-			(S3C2410_DCON_HWTRIG | S3C2410_DCON_CH0_SDI));
+		s3c2410_dma_config(host->dma, 4, 0);
 		s3c2410_dma_set_buffdone_fn(host->dma,
 					    s3cmci_dma_done_callback);
 		s3c2410_dma_setflags(host->dma, S3C2410_DMAF_AUTOSTART);