Merge branch develop-3.10 into develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / hdmi / rk_hdmi.h

diff --git a/drivers/video/rockchip/hdmi/rk_hdmi.h b/drivers/video/rockchip/hdmi/rk_hdmi.h
index d13bed5da6373c6fb3dd553066b22eb6ed1f7c59..c853654871a5c3693482baa353e258a7a49d95b2 100755 (executable)
--- a/drivers/video/rockchip/hdmi/rk_hdmi.h
+++ b/drivers/video/rockchip/hdmi/rk_hdmi.h
@@ -364,7 +364,6 @@ struct hdmi {
        int tmdsclk;            /* TDMS Clock frequency */
        int pixclock;           /* Pixel Clcok frequency */
        int uboot_logo;
-       int uboot_vic;
 
        struct list_head pwrlist_head;