summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-02-03 20:03:46 +0100
committerWolfgang Denk <wd@denx.de>2010-02-03 20:03:46 +0100
commit0ae016f1ff6b06e94db52373efd08d106bfcecdf (patch)
treeb0ad230adfa839a5829fb7e4083c8706e594b2f6 /common
parentd0750bc9e5932baf4c90eda2456106f21a26bdc1 (diff)
parenta6e42ed097220a82870a32f4e60ac8863a8b05ab (diff)
downloadu-boot-imx-0ae016f1ff6b06e94db52373efd08d106bfcecdf.zip
u-boot-imx-0ae016f1ff6b06e94db52373efd08d106bfcecdf.tar.gz
u-boot-imx-0ae016f1ff6b06e94db52373efd08d106bfcecdf.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'common')
-rw-r--r--common/lcd.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/common/lcd.c b/common/lcd.c
index 4e31618..db799db 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -456,22 +456,14 @@ ulong lcd_setmem (ulong addr)
static void lcd_setfgcolor (int color)
{
-#ifdef CONFIG_ATMEL_LCD
lcd_color_fg = color;
-#else
- lcd_color_fg = color & 0x0F;
-#endif
}
/*----------------------------------------------------------------------*/
static void lcd_setbgcolor (int color)
{
-#ifdef CONFIG_ATMEL_LCD
lcd_color_bg = color;
-#else
- lcd_color_bg = color & 0x0F;
-#endif
}
/*----------------------------------------------------------------------*/