diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-07-21 06:13:17 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 03:12:11 -0400 |
commit | c2439398170be9d7af28eb3ab59593369cb303f3 (patch) | |
tree | 19a1b4078363950e13c940dcd32d38e884a8257b /drivers/video | |
parent | b90884c886696a67a4c7832b4e627f341a860b3d (diff) |
sh: add a parameter to LCDC driver's .display_on() callback
HDMI support for the sh_mobile_lcdc framebuffer driver will require a 'struct
fb_info *' pointer for its .display_on() callback. While at it fix kfr2r09
framebuffer modular build.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/sh_mipi_dsi.c | 2 | ||||
-rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/sh_mipi_dsi.c b/drivers/video/sh_mipi_dsi.c index 017ae9f47d36..5699ce0c1780 100644 --- a/drivers/video/sh_mipi_dsi.c +++ b/drivers/video/sh_mipi_dsi.c | |||
@@ -100,7 +100,7 @@ static void sh_mipi_shutdown(struct platform_device *pdev) | |||
100 | sh_mipi_dsi_enable(mipi, false); | 100 | sh_mipi_dsi_enable(mipi, false); |
101 | } | 101 | } |
102 | 102 | ||
103 | static void mipi_display_on(void *arg) | 103 | static void mipi_display_on(void *arg, struct fb_info *info) |
104 | { | 104 | { |
105 | struct sh_mipi *mipi = arg; | 105 | struct sh_mipi *mipi = arg; |
106 | 106 | ||
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index 0c97509d0237..b9e6f93642d2 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c | |||
@@ -577,7 +577,7 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv) | |||
577 | 577 | ||
578 | board_cfg = &ch->cfg.board_cfg; | 578 | board_cfg = &ch->cfg.board_cfg; |
579 | if (board_cfg->display_on) | 579 | if (board_cfg->display_on) |
580 | board_cfg->display_on(board_cfg->board_data); | 580 | board_cfg->display_on(board_cfg->board_data, ch->info); |
581 | } | 581 | } |
582 | 582 | ||
583 | return 0; | 583 | return 0; |