commit ede68db59e221f55040211738c793451b1ed9371
author Linux Build Service Account <lnxbuild@localhost> Wed Dec 11 20:41:01 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Dec 11 20:41:01 2013 -0800
tree 4b534219ad2f381c8ae11f22c770aed942db5a66
parent 817ad6b3f5699342d1697ee87238ef04fd406610
parent d1e5d8de3ed501e825d8996bce3b99390aebfc69

Merge "dev: gcdb: Fix bug in passing of boot argument"

dev/gcdb/display/gcdb_display.c

diff --git a/dev/gcdb/display/gcdb_display.c b/dev/gcdb/display/gcdb_display.c
index e7f11f3..6167d07 100755
--- a/dev/gcdb/display/gcdb_display.c
+++ b/dev/gcdb/display/gcdb_display.c
@@ -163,7 +163,7 @@
 	{
 		if (target_is_edp())
 		{
-			default_str = "0:edp:";
+			default_str = "1:edp:";
 		}
 		else
 		{

platform/msm_shared/edp.c

diff --git a/platform/msm_shared/edp.c b/platform/msm_shared/edp.c
index d7c3067..59e7aad 100644
--- a/platform/msm_shared/edp.c
+++ b/platform/msm_shared/edp.c
@@ -200,7 +200,7 @@
 	if (!pinfo)
 		return;
 
-	pinfo->lcdc.dual_pipe = 1;
+	pinfo->lcdc.dual_pipe = 0;
 	pinfo->lcdc.split_display = 0;
 
 	edp_pinfo = pinfo;