projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[firefly-linux-kernel-4.4.55.git]
/
include
/
video
/
omapdss.h
diff --git
a/include/video/omapdss.h
b/include/video/omapdss.h
index c8ed15daad02d37c5a8eec0b3787dfabf8ad9d3f..f001a356fd98f896ae617fe64db45745e1dc4736 100644
(file)
--- a/
include/video/omapdss.h
+++ b/
include/video/omapdss.h
@@
-129,14
+129,13
@@
enum omap_rfbi_te_mode {
};
enum omap_dss_signal_level {
};
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 {
};
enum omap_dss_signal_edge {
- OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
- OMAPDSS_DRIVE_SIG_RISING_EDGE,
OMAPDSS_DRIVE_SIG_FALLING_EDGE,
OMAPDSS_DRIVE_SIG_FALLING_EDGE,
+ OMAPDSS_DRIVE_SIG_RISING_EDGE,
};
enum omap_dss_venc_type {
};
enum omap_dss_venc_type {