From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 9 Jul 2013 06:36:03 +0000 (+0800)
Subject: rk2928: fix lvds support, rename from rk_lvds
X-Git-Tag: firefly_0821_release~6917
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=29e180c979793d6a4bb593e4bf8bbea0f32d6578;p=firefly-linux-kernel-4.4.55.git

rk2928: fix lvds support, rename from rk_lvds
---

diff --git a/drivers/video/rockchip/lcdc/rk2928_lcdc.c b/drivers/video/rockchip/lcdc/rk2928_lcdc.c
index 0e27492f05e2..414c45be9064 100644
--- a/drivers/video/rockchip/lcdc/rk2928_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk2928_lcdc.c
@@ -293,7 +293,7 @@ static int rk2928_load_screen(struct rk_lcdc_device_driver *dev_drv, bool initsc
 	}
  	spin_unlock(&lcdc_dev->reg_lock);
 
-#ifdef CONFIG_RK_LVDS
+#ifdef CONFIG_RK2928_LVDS
 	rk_lvds_register(dev_drv->screen0);
 #endif
 	if(dev_drv->screen0->type == SCREEN_RGB) //iomux for RGB screen
diff --git a/drivers/video/rockchip/transmitter/Kconfig b/drivers/video/rockchip/transmitter/Kconfig
index cbd56e27e36b..502ffcbe4c48 100644
--- a/drivers/video/rockchip/transmitter/Kconfig
+++ b/drivers/video/rockchip/transmitter/Kconfig
@@ -4,7 +4,7 @@ menuconfig RK_TRSM
 	depends on FB_ROCKCHIP
 
 config RK2928_LVDS
-	bool "RK2928、RK2926 lvds transmitter support"
+	bool "RK2928/RK2926 lvds transmitter support"
         depends on ARCH_RK2928 && RK_TRSM
 
 config RK610_LVDS
diff --git a/drivers/video/rockchip/transmitter/rk2928_lvds.c b/drivers/video/rockchip/transmitter/rk2928_lvds.c
index 1686be30d1d3..30adbed99121 100644
--- a/drivers/video/rockchip/transmitter/rk2928_lvds.c
+++ b/drivers/video/rockchip/transmitter/rk2928_lvds.c
@@ -3,7 +3,7 @@
 #include <asm/io.h>
 #include <mach/io.h>
 #include <linux/rk_screen.h>
-#include "rk_lvds.h"
+#include "rk2928_lvds.h"
 
 static void rk_output_lvds(rk_screen *screen)
 {