summaryrefslogtreecommitdiffstats
path: root/include/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-04-20 12:09:31 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-04-20 12:09:31 +0300
commit6b75b54c841a18ef114704aa5cf2cdf43487b0ae (patch)
tree3d2f0e1dc68d96cfd7fc7b32863b155801098544 /include/video
parent7374ccc0c322a6dc55f783a1a9c816c6f308d990 (diff)
parentaa977f62dff4fb41e89b473c9831c292c01d8bfc (diff)
downloadblackbird-op-linux-6b75b54c841a18ef114704aa5cf2cdf43487b0ae.tar.gz
blackbird-op-linux-6b75b54c841a18ef114704aa5cf2cdf43487b0ae.zip
Merge omapdss topic branch for fbdev 4.1
Diffstat (limited to 'include/video')
-rw-r--r--include/video/omapdss.h7
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 {
OpenPOWER on IntegriCloud