Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[deliverable/linux.git] / include / video / exynos5433_decon.h

diff --git a/include/video/exynos5433_decon.h b/include/video/exynos5433_decon.h
index c1c1ca18abc0a140814941a2d91abcaf029068c1..0098a522d9f48bd77e82a314c1d45b7cf77b0586 100644 (file)
--- a/include/video/exynos5433_decon.h
+++ b/include/video/exynos5433_decon.h
@@ -179,9 +179,9 @@
 #define TRIGCON_TRIGMODE_W1BUF         (1 << 10)
 #define TRIGCON_SWTRIGCMD_W0BUF                (1 << 6)
 #define TRIGCON_TRIGMODE_W0BUF         (1 << 5)
-#define TRIGCON_HWTRIGMASK_I80_RGB     (1 << 4)
-#define TRIGCON_HWTRIGEN_I80_RGB       (1 << 3)
-#define TRIGCON_HWTRIG_INV_I80_RGB     (1 << 2)
+#define TRIGCON_HWTRIGMASK             (1 << 4)
+#define TRIGCON_HWTRIGEN               (1 << 3)
+#define TRIGCON_HWTRIG_INV             (1 << 2)
 #define TRIGCON_SWTRIGCMD              (1 << 1)
 #define TRIGCON_SWTRIGEN               (1 << 0)