summaryrefslogtreecommitdiff
path: root/drivers/video/omap2/dss/dss_features.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/omap2/dss/dss_features.h')
-rw-r--r--drivers/video/omap2/dss/dss_features.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h
index cd833bbaac3d..50caee9192a2 100644
--- a/drivers/video/omap2/dss/dss_features.h
+++ b/drivers/video/omap2/dss/dss_features.h
@@ -58,6 +58,7 @@ enum dss_feat_id {
FEAT_FIR_COEF_V = 1 << 25,
FEAT_ALPHA_FIXED_ZORDER = 1 << 26,
FEAT_ALPHA_FREE_ZORDER = 1 << 27,
+ FEAT_FIFO_MERGE = 1 << 28,
};
/* DSS register field id */