Merge tag 'lsk-v3.10-android-14.07' into develop-3.10

[firefly-linux-kernel-4.4.55.git] / include / video / display_timing.h

diff --git a/include/video/display_timing.h b/include/video/display_timing.h
index 3e64b4144c7966585c3ee6acd7f1a03fdf2d711f..bf2bd657e0c45b78296017a75d12d29af5cec411 100644 (file)
--- a/include/video/display_timing.h
+++ b/include/video/display_timing.h
@@ -27,7 +27,7 @@ enum display_flags {
        DISPLAY_FLAGS_PIXDATA_NEGEDGE   = BIT(7),
        DISPLAY_FLAGS_INTERLACED        = BIT(8),
        DISPLAY_FLAGS_DOUBLESCAN        = BIT(9),
-#if defined(CONFIG_FB_ROCKCHIP)
+#if defined(CONFIG_FB_ROCKCHIP) || defined(CONFIG_DRM_ROCKCHIP)
        DISPLAY_FLAGS_SWAP_GB           = BIT(10),
        DISPLAY_FLAGS_SWAP_RG           = BIT(11),
        DISPLAY_FLAGS_SWAP_RB           = BIT(12),