From: Dan Willemsen <dwillemsen@nvidia.com>
Date: Fri, 2 Nov 2012 03:12:09 +0000 (-0700)
Subject: Partial Revert "ARM: tegra: curacao: enable DC to run on simulator"
X-Git-Tag: daily-2014.03.25.0_l4t/l4t-r19.1~9225
X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-3.10.git;a=commitdiff_plain;h=e0a548f28d39444248625312fe161f91a55432d1

Partial Revert "ARM: tegra: curacao: enable DC to run on simulator"

This reverts commit a9f941dbf764f0a109a92bbda25187a125cce277.

Conflicts:

	arch/arm/mach-tegra/board-curacao-panel.c

Rebase-Id: R9eb5488be3e6edab920317932aa0edbe2d5163d5
---

diff --git a/arch/arm/mach-tegra/board-curacao-panel.c b/arch/arm/mach-tegra/board-curacao-panel.c
index 84a9782b6ef..6318bf1c430 100644
--- a/arch/arm/mach-tegra/board-curacao-panel.c
+++ b/arch/arm/mach-tegra/board-curacao-panel.c
@@ -362,11 +362,7 @@ static struct tegra_dsi_out curacao_dsi = {
 static struct tegra_dc_out curacao_disp1_out = {
 	.sd_settings	= &curacao_sd_settings,
 
-#ifdef CONFIG_TEGRA_SIMULATION_PLATFORM
-	.type		= TEGRA_DC_OUT_RGB,
-#else
 	.type		= TEGRA_DC_OUT_DSI,
-#endif
 	.dsi		= &curacao_dsi,
 
 	.align		= TEGRA_DC_ALIGN_MSB,