diff options
| author |   Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-04-20 12:09:31 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-04-20 12:09:31 +0300 |
| commit | 6b75b54c841a18ef114704aa5cf2cdf43487b0ae (patch) | |
| tree | 3d2f0e1dc68d96cfd7fc7b32863b155801098544 /include/video | |
| parent | fbdev: sh_mobile_lcdc: Fix destruction of uninitialized mutex (diff) | |
| parent | omapdss: extend pm notifier to handle hibernation (diff) | |
| download | linux-dev-6b75b54c841a18ef114704aa5cf2cdf43487b0ae.tar.xz linux-dev-6b75b54c841a18ef114704aa5cf2cdf43487b0ae.zip | |
Merge omapdss topic branch for fbdev 4.1
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/omapdss.h | 7 |
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 { |