From: yxj Date: Thu, 9 May 2013 01:10:57 +0000 (+0800) Subject: rk3066b lcdc:fix vif support X-Git-Tag: firefly_0821_release~7123 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=79262c5a6cf784714b95f778f432ee3d575baa0f;p=firefly-linux-kernel-4.4.55.git rk3066b lcdc:fix vif support --- diff --git a/drivers/video/rockchip/lcdc/rk3066b_lcdc.c b/drivers/video/rockchip/lcdc/rk3066b_lcdc.c index 11b8c8a27671..9a1a7cf2e08b 100755 --- a/drivers/video/rockchip/lcdc/rk3066b_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk3066b_lcdc.c @@ -1139,7 +1139,7 @@ static int __devinit rk3066b_lcdc_probe (struct platform_device *pdev) screen->lcdc_id = lcdc_dev->id; screen->screen_id = 0; -#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF)) +#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_LVDS)) screen1 = kzalloc(sizeof(rk_screen), GFP_KERNEL); if(!screen1) { @@ -1181,7 +1181,7 @@ static int __devinit rk3066b_lcdc_probe (struct platform_device *pdev) printk("lcdc%d:reg_phy_base = 0x%08x,reg_vir_base:0x%p\n",pdev->id,lcdc_dev->reg_phy_base, lcdc_dev->preg); lcdc_dev->driver.dev=&pdev->dev; lcdc_dev->driver.screen0 = screen; -#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF)) +#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_LVDS)) lcdc_dev->driver.screen1 = screen1; #endif lcdc_dev->driver.cur_screen = screen;