diff options
| author | Tom Rini <trini@ti.com> | 2013-07-10 08:42:25 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-10 08:42:25 -0400 |
| commit | 2f4998ab4429af4b805f8566268c3b761aa4babd (patch) | |
| tree | 781c234b704484f833779e29ab6f9330ebf00e9f /include/lcd.h | |
| parent | c479c1361ade3cf2346f41a922b85373ddff8a26 (diff) | |
| parent | ff8fb56b6f7edafc1bcba8ef008b3f368cabe60d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'include/lcd.h')
| -rw-r--r-- | include/lcd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/lcd.h b/include/lcd.h index 30225edf56..8718a01902 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -37,7 +37,6 @@ extern struct vidinfo panel_info; void lcd_ctrl_init(void *lcdbase); void lcd_enable(void); -int board_splash_screen_prepare(void); /* setcolreg used in 8bpp/16bpp; initcolregs used in monochrome */ void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue); @@ -46,7 +45,8 @@ void lcd_initcolregs(void); int lcd_getfgcolor(void); /* gunzip_bmp used if CONFIG_VIDEO_BMP_GZIP */ -struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp); +struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp, + void **alloc_addr); int bmp_display(ulong addr, int x, int y); /** |