Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

[cascardo/linux.git] / include / video / sh_mobile_lcdc.h

diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h
index 7571b27..ff43ffc 100644 (file)
--- a/include/video/sh_mobile_lcdc.h
+++ b/include/video/sh_mobile_lcdc.h
@@ -166,6 +166,12 @@ struct sh_mobile_lcdc_bl_info {
        int (*get_brightness)(void);
 };
 
+struct sh_mobile_lcdc_overlay_cfg {
+       int fourcc;
+       unsigned int max_xres;
+       unsigned int max_yres;
+};
+
 struct sh_mobile_lcdc_chan_cfg {
        int chan;
        int fourcc;
@@ -186,6 +192,7 @@ struct sh_mobile_lcdc_chan_cfg {
 struct sh_mobile_lcdc_info {
        int clock_source;
        struct sh_mobile_lcdc_chan_cfg ch[2];
+       struct sh_mobile_lcdc_overlay_cfg overlays[4];
        struct sh_mobile_meram_info *meram_dev;
 };