diff options
author | Stefano Babic <sbabic@denx.de> | 2014-07-16 08:51:30 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2014-07-16 08:51:30 +0200 |
commit | dab5e3469d294a4e1ffed8407d296a78e02cc01f (patch) | |
tree | c6378034591210b3142ca3add806d52c6ea22b3b /include/lcd.h | |
parent | 14a1613140519a8d0a88e6054c302a8cb3e067a5 (diff) | |
parent | 524123a70761110c5cf3ccc5f52f6d4da071b959 (diff) | |
download | u-boot-imx-dab5e3469d294a4e1ffed8407d296a78e02cc01f.zip u-boot-imx-dab5e3469d294a4e1ffed8407d296a78e02cc01f.tar.gz u-boot-imx-dab5e3469d294a4e1ffed8407d296a78e02cc01f.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
Conflicts:
boards.cfg
Diffstat (limited to 'include/lcd.h')
-rw-r--r-- | include/lcd.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/lcd.h b/include/lcd.h index 5f84cd3..cc2ee3f 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -258,10 +258,6 @@ extern vidinfo_t panel_info; /* Video functions */ -#if defined(CONFIG_RBC823) -void lcd_disable(void); -#endif - void lcd_putc(const char c); void lcd_puts(const char *s); void lcd_printf(const char *fmt, ...); |