diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 20:14:38 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 20:14:38 +0100 |
| commit | b3773301c4290f054aa2aa5379e59a1bf4f78bdf (patch) | |
| tree | aac1619d32800393b587bf034c7dadb9e3c24f7b /include/video | |
| parent | be6786ac738801d39cfd264ec88c352efd029578 (diff) | |
| parent | 1a0b1eac5012326e52d1dcf78695ac08f41c37d7 (diff) | |
| download | blackbird-op-linux-b3773301c4290f054aa2aa5379e59a1bf4f78bdf.tar.gz blackbird-op-linux-b3773301c4290f054aa2aa5379e59a1bf4f78bdf.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts:
drivers/video/sh_mobile_hdmi.c
Diffstat (limited to 'include/video')
| -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 */ |
