From 845a16ab4d6066d763874bc6bf8d641e444934e3 Mon Sep 17 00:00:00 2001 From: yxj Date: Sun, 28 Apr 2013 12:18:56 +0800 Subject: [PATCH] lcdc:rename CONFIG_RK616_LVDS to CONFIG_RK616_VIF --- drivers/video/rockchip/lcdc/rk3066b_lcdc.c | 4 ++-- drivers/video/rockchip/lcdc/rk30_lcdc.c | 4 ++-- drivers/video/rockchip/lcdc/rk3188_lcdc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/video/rockchip/lcdc/rk3066b_lcdc.c b/drivers/video/rockchip/lcdc/rk3066b_lcdc.c index 9a1a7cf2e08b..11b8c8a27671 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_LVDS)) +#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF)) 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_LVDS)) +#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF)) lcdc_dev->driver.screen1 = screen1; #endif lcdc_dev->driver.cur_screen = screen; diff --git a/drivers/video/rockchip/lcdc/rk30_lcdc.c b/drivers/video/rockchip/lcdc/rk30_lcdc.c index d1ce4ab1892e..ef80d5e3a085 100644 --- a/drivers/video/rockchip/lcdc/rk30_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk30_lcdc.c @@ -1541,7 +1541,7 @@ static int __devinit rk30_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_LVDS)) +#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF)) screen1 = kzalloc(sizeof(rk_screen), GFP_KERNEL); if(!screen1) { @@ -1591,7 +1591,7 @@ static int __devinit rk30_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->regs); 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_LVDS)) +#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF)) lcdc_dev->driver.screen1 = screen1; #endif lcdc_dev->driver.cur_screen = screen; diff --git a/drivers/video/rockchip/lcdc/rk3188_lcdc.c b/drivers/video/rockchip/lcdc/rk3188_lcdc.c index 8ac6fa3ad2e2..30e70a1d8e05 100644 --- a/drivers/video/rockchip/lcdc/rk3188_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk3188_lcdc.c @@ -1394,7 +1394,7 @@ static int __devinit rk3188_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_LVDS)) +#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF)) screen1 = kzalloc(sizeof(rk_screen), GFP_KERNEL); if(!screen1) { @@ -1444,7 +1444,7 @@ static int __devinit rk3188_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->regs); lcdc_dev->driver.dev = dev; lcdc_dev->driver.screen0 = screen; -#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_LVDS)) +#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF)) lcdc_dev->driver.screen1 = screen1; #endif lcdc_dev->driver.cur_screen = screen; -- 2.34.1