From: yxj <yxj@rock-chips.com>
Date: Mon, 31 Dec 2012 02:45:40 +0000 (+0800)
Subject: rk3168:ds1006h:use lcdc1 as primary display device
X-Git-Tag: firefly_0821_release~8030
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a9fadb56c960f5937041df37a8921665053e541a;p=firefly-linux-kernel-4.4.55.git

rk3168:ds1006h:use lcdc1 as primary display device
---

diff --git a/arch/arm/mach-rk30/board-rk3168-ds1006h.c b/arch/arm/mach-rk30/board-rk3168-ds1006h.c
index 30ad8afebbd5..0a2e5bf7406d 100644
--- a/arch/arm/mach-rk30/board-rk3168-ds1006h.c
+++ b/arch/arm/mach-rk30/board-rk3168-ds1006h.c
@@ -409,18 +409,12 @@ struct rk29fb_info lcdc0_screen_info = {
 
 #if defined(CONFIG_LCDC1_RK3066B)
 struct rk29fb_info lcdc1_screen_info = {
-	#if defined(CONFIG_RK_HDMI)
-	.prop		= EXTEND,	//extend display device
-	.lcd_info  = NULL,
-	.set_screen_info = hdmi_init_lcdc,
-	#endif
-	#if defined(CONFIG_MFD_RK610)
 	.prop	   = PRMRY,		//primary display device
 	.io_init   = rk_fb_io_init,
 	.io_disable = rk_fb_io_disable,
 	.io_enable = rk_fb_io_enable,
 	.set_screen_info = set_lcd_info,
-	#endif
+	
 };
 #endif