Merge omapdss topic branch for fbdev 4.1

1 files changed, 3 insertions, 4 deletions

diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 60de61fea8e3..45a230190720 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -129,14 +129,13 @@ enum omap_rfbi_te_mode {
 };
 
 enum omap_dss_signal_level {
-        OMAPDSS_SIG_ACTIVE_HIGH = 0,
-        OMAPDSS_SIG_ACTIVE_LOW  = 1,
+        OMAPDSS_SIG_ACTIVE_LOW,
+        OMAPDSS_SIG_ACTIVE_HIGH,
 };
 
 enum omap_dss_signal_edge {
-        OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
-        OMAPDSS_DRIVE_SIG_RISING_EDGE,
         OMAPDSS_DRIVE_SIG_FALLING_EDGE,
+        OMAPDSS_DRIVE_SIG_RISING_EDGE,
 };
 
 enum omap_dss_venc_type {