---

yaml --- r: 337844 b: refs/heads/master c: 2d8f46f h: refs/heads/master v: v3
git-mirror · Nov 13, 2012 · d12b792 · d12b792
1 parent a845af2
commit d12b792
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -673,8 +673,6 @@ static int ipu_reset(struct ipu_soc *ipu)
 		cpu_relax();
 	}
 
-	mdelay(300);
-
 	return 0;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -673,8 +673,6 @@ static int ipu_reset(struct ipu_soc *ipu) @@
     		cpu_relax();
     	}
-    	mdelay(300);
     	return 0;
     }
@@ Expand Down @@