From d12b792dfab58606ca6a80d0e8a6b3be16df25ac Mon Sep 17 00:00:00 2001
From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Mon, 12 Nov 2012 16:29:04 +0100
Subject: [PATCH] --- yaml --- r: 337844 b: refs/heads/master c:
 2d8f46f286a80255d8c684fb12fd40feb37ad258 h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 97e8f369776e..2173202cfe9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87e31a0795059315576cccce1205aed663c6502d
+refs/heads/master: 2d8f46f286a80255d8c684fb12fd40feb37ad258
diff --git a/trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c
index eaa6f62a9e33..cd05718b7044 100644
--- a/trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c
+++ b/trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c
@@ -673,8 +673,6 @@ static int ipu_reset(struct ipu_soc *ipu)
 		cpu_relax();
 	}
 
-	mdelay(300);
-
 	return 0;
 }