Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 251083
b: refs/heads/master
c: 72e91ac
h: refs/heads/master
i:
  251081: 3e9b6ae
  251079: 3720b89
v: v3
  • Loading branch information
Ricardo Neri authored and Tomi Valkeinen committed May 19, 2011
1 parent 9cb4630 commit 96525e5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6ff7084edfd31410c1d4112ed2b3bdc11485af94
refs/heads/master: 72e91ace30d0bdfe3140011f65cdcd6e46215f71
2 changes: 1 addition & 1 deletion trunk/drivers/video/omap2/dss/dss_features.c
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ static const struct omap_dss_features omap4_dss_features = {
FEAT_MGR_LCD2 | FEAT_GLOBAL_ALPHA_VID1 |
FEAT_CORE_CLK_DIV | FEAT_LCD_CLK_SRC |
FEAT_DSI_DCS_CMD_CONFIG_VC | FEAT_DSI_VC_OCP_WIDTH |
FEAT_DSI_GNQ,
FEAT_DSI_GNQ | FEAT_HDMI_CTS_SWMODE,

.num_mgrs = 3,
.num_ovls = 3,
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/video/omap2/dss/dss_features.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ enum dss_feat_id {
FEAT_DSI_VC_OCP_WIDTH = 1 << 16,
FEAT_DSI_REVERSE_TXCLKESC = 1 << 17,
FEAT_DSI_GNQ = 1 << 18,
FEAT_HDMI_CTS_SWMODE = 1 << 19,
};

/* DSS register field id */
Expand Down

0 comments on commit 96525e5

Please sign in to comment.