From: Tomi Valkeinen Date: Fri, 13 Jan 2012 11:24:04 +0000 (+0200) Subject: OMAPDSS: FEAT: Add FIFO_MERGE feature X-Git-Tag: v3.4-rc1~125^2~8^2~20^2~5 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6b0f884520e604408ebda3b60605cabe0a8d162;p=pandora-kernel.git OMAPDSS: FEAT: Add FIFO_MERGE feature Add feature flag for fifo merge. OMAP2 doesn't contain fifo merge, later OMAPs do. dispc_enable_fifomerge() checks for the flag when called, and gives a WARN if fifo merge is being enabled when it is not supported. Signed-off-by: Tomi Valkeinen --- Reading git-diff-tree failed