lcdc_hdmi_xxx.c:compatile with new rk fb dual dispaly framework

diff --git a/drivers/video/display/screen/lcd_hdmi_1024x768.c b/drivers/video/display/screen/lcd_hdmi_1024x768.c
index 47124e315fa18f7454b0661745eb4ecc0db1e056..554215328be1979069235bdeecfe7532fe22c80a 100644 (file)
--- a/drivers/video/display/screen/lcd_hdmi_1024x768.c
+++ b/drivers/video/display/screen/lcd_hdmi_1024x768.c
@@ -126,7 +126,8 @@
 /* Other */\r
 #define DCLK_POL               0\r
 #define SWAP_RB                        0 \r
-#ifdef  CONFIG_HDMI_DUAL_DISP\r
+\r
+#if  ( defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& defined(CONFIG_RK610_LVDS) ) || defined(CONFIG_HDMI_DUAL_DISP)\r
 static int set_scaler_info(struct rk29fb_screen *screen, u8 hdmi_resolution)\r
 {\r
     screen->s_clk_inv = S_DCLK_POL;\r

diff --git a/drivers/video/display/screen/lcd_hdmi_1280x800.c b/drivers/video/display/screen/lcd_hdmi_1280x800.c
index 969196e4dbda5b9eee256af46706c7b52698974d..17b3d44b7bce2dc8839468662f58ce82b244892f 100644 (file)
--- a/drivers/video/display/screen/lcd_hdmi_1280x800.c
+++ b/drivers/video/display/screen/lcd_hdmi_1280x800.c
@@ -131,7 +131,8 @@
 /* Other */\r
 #define DCLK_POL               0\r
 #define SWAP_RB                        0 \r
-#ifdef  CONFIG_HDMI_DUAL_DISP\r
+\r
+#if  ( defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& defined(CONFIG_RK610_LVDS) ) || defined(CONFIG_HDMI_DUAL_DISP)\r
 static int set_scaler_info(struct rk29fb_screen *screen, u8 hdmi_resolution)\r
 {\r
     screen->s_clk_inv = S_DCLK_POL;\r

diff --git a/drivers/video/display/screen/lcd_hdmi_800x480.c b/drivers/video/display/screen/lcd_hdmi_800x480.c
index cf2653c1e9e9d2d4d5c853a134fa063c27b4c982..8a374c0ceb6d3edc257f38f1252ac7b00ce9f477 100644 (file)
--- a/drivers/video/display/screen/lcd_hdmi_800x480.c
+++ b/drivers/video/display/screen/lcd_hdmi_800x480.c
@@ -123,8 +123,10 @@
 
 /* Other */
 #define DCLK_POL               0
-#define SWAP_RB                        0 
-#ifdef  CONFIG_HDMI_DUAL_DISP
+#define SWAP_RB                        0
+ 
+#if  ( defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& defined(CONFIG_RK610_LVDS) ) || defined(CONFIG_HDMI_DUAL_DISP)
+
 static int set_scaler_info(struct rk29fb_screen *screen, u8 hdmi_resolution)
 {
     screen->s_clk_inv = S_DCLK_POL;