Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

[~andy/linux] / include / media / davinci / vpif_types.h

diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h
index bd8217c2577c4cbcf65481056b353ca0981262b8..d8f6ab1943e4e492679b1b4ae58ac1244496cc72 100644 (file)
--- a/include/media/davinci/vpif_types.h
+++ b/include/media/davinci/vpif_types.h
@@ -50,6 +50,8 @@ struct vpif_display_config {
        const char **output;
        int output_count;
        const char *card_name;
+       bool ch2_clip_en;
+       bool ch3_clip_en;
 };
 
 struct vpif_input {