From 0cd107fd177e1418f164ea5fa77e68745b84a86f Mon Sep 17 00:00:00 2001 From: yxj Date: Sat, 8 Sep 2012 17:05:26 +0800 Subject: [PATCH] lcd b101ew05:fix compile err when no use rk610 lvds --- drivers/video/display/screen/lcd_b101ew05.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/video/display/screen/lcd_b101ew05.c b/drivers/video/display/screen/lcd_b101ew05.c index d3ef5fa43ba7..03228b1f46ec 100755 --- a/drivers/video/display/screen/lcd_b101ew05.c +++ b/drivers/video/display/screen/lcd_b101ew05.c @@ -83,7 +83,7 @@ int dsp_lut[256] ={ 0x00f8f8f8, 0x00f9f9f9, 0x00fafafa, 0x00fbfbfb, 0x00fcfcfc, 0x00fdfdfd, 0x00fefefe, 0x00ffffff, }; -#ifdef CONFIG_ONE_LCDC_DUAL_OUTPUT_INF +#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& defined(CONFIG_RK610_LVDS) /* scaler Timing */ //1920*1080*60 @@ -282,15 +282,16 @@ static int set_scaler_info(struct rk29fb_screen *screen, u8 hdmi_resolution) return 0; } #else -static int set_scaler_info(struct rk29fb_screen *screen, u8 hdmi_resolution) NULL +#define set_scaler_info NULL #endif void set_lcd_info(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info ) { /* screen type & face */ screen->type = OUT_TYPE; - screen->face = OUT_FACE; +#ifdef CONFIG_RK610_LVDS screen->hw_format = OUT_FORMAT; +#endif /* Screen size */ screen->x_res = H_VD; -- 2.34.1