diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-28 11:18:58 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-28 11:18:58 +1000 |
| commit | 6a546294e485f245e0401158748e1df245165c67 (patch) | |
| tree | 8d1cfcea4e01d28fa4ca5404b3ab4bd3aa1ec62d /include | |
| parent | 19a94a4bb9e4619d78609acb8b2707b0c968bf9d (diff) | |
| parent | 5d8e3451d172441ac9f4aa1d0ff8706412bc7deb (diff) | |
Merge remote branch 'genesis/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/video/sh_mobile_lcdc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h index 55d700e8566e..daabae5817c6 100644 --- a/include/video/sh_mobile_lcdc.h +++ b/include/video/sh_mobile_lcdc.h @@ -49,7 +49,9 @@ struct sh_mobile_lcdc_sys_bus_ops { unsigned long (*read_data)(void *handle); }; +struct module; struct sh_mobile_lcdc_board_cfg { + struct module *owner; void *board_data; int (*setup_sys)(void *board_data, void *sys_ops_handle, struct sh_mobile_lcdc_sys_bus_ops *sys_ops); @@ -70,7 +72,8 @@ struct sh_mobile_lcdc_chan_cfg { int interface_type; /* selects RGBn or SYSn I/F, see above */ int clock_divider; unsigned long flags; /* LCDC_FLAGS_... */ - struct fb_videomode lcd_cfg; + const struct fb_videomode *lcd_cfg; + int num_cfg; struct sh_mobile_lcdc_lcd_size_cfg lcd_size_cfg; struct sh_mobile_lcdc_board_cfg board_cfg; struct sh_mobile_lcdc_sys_bus_cfg sys_bus_cfg; /* only for SYSn I/F */ |