diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-07-21 10:13:17 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 16:12:11 +0900 |
| commit | c2439398170be9d7af28eb3ab59593369cb303f3 (patch) | |
| tree | 19a1b4078363950e13c940dcd32d38e884a8257b /arch/sh/boards | |
| parent | b90884c886696a67a4c7832b4e627f341a860b3d (diff) | |
| download | linux-c2439398170be9d7af28eb3ab59593369cb303f3.tar.bz2 | |
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 'arch/sh/boards')
| -rw-r--r-- | arch/sh/boards/mach-ap325rxa/setup.c | 2 | ||||
| -rw-r--r-- | arch/sh/boards/mach-kfr2r09/Makefile | 6 | ||||
| -rw-r--r-- | arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c index 3a170bd3f3d0..5471989d46ff 100644 --- a/arch/sh/boards/mach-ap325rxa/setup.c +++ b/arch/sh/boards/mach-ap325rxa/setup.c @@ -154,7 +154,7 @@ static struct platform_device nand_flash_device = { #define PORT_DRVCRA 0xA405018A #define PORT_DRVCRB 0xA405018C -static void ap320_wvga_power_on(void *board_data) +static void ap320_wvga_power_on(void *board_data, struct fb_info *info) { msleep(100); diff --git a/arch/sh/boards/mach-kfr2r09/Makefile b/arch/sh/boards/mach-kfr2r09/Makefile index 4e577a3bf658..60dd63f4a427 100644 --- a/arch/sh/boards/mach-kfr2r09/Makefile +++ b/arch/sh/boards/mach-kfr2r09/Makefile @@ -1,2 +1,4 @@ -obj-y := setup.o sdram.o -obj-$(CONFIG_FB_SH_MOBILE_LCDC) += lcd_wqvga.o +obj-y := setup.o sdram.o +ifneq ($(CONFIG_FB_SH_MOBILE_LCDC),) +obj-y += lcd_wqvga.o +endif diff --git a/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c b/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c index e9b970846c41..25e145fb7087 100644 --- a/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c +++ b/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c @@ -327,7 +327,7 @@ static int kfr2r09_lcd_backlight(int on) return 0; } -void kfr2r09_lcd_on(void *board_data) +void kfr2r09_lcd_on(void *board_data, struct fb_info *info) { kfr2r09_lcd_backlight(1); } |