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 0e27492f05e2b27f19e5baa9174908a51f39d0fb..414c45be906493433b8c37b704ed46e8dc17fe4c 100644 (file)
--- 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 cbd56e27e36b6fdba564660b096ccbc3f447d83e..502ffcbe4c484237b0525eb06ca56c68cb23a71a 100644 (file)
--- 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 1686be30d1d3953012026e44e9226cfeccad6250..30adbed991212c4f9a14677550e52521c50658cf 100644 (file)
--- 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)
 {