diff options
author | Tom Rini <trini@ti.com> | 2015-01-14 16:26:15 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2015-01-14 16:26:15 -0500 |
commit | 28c4dae114c9b94b2a1111d81d4da716e9fc2cba (patch) | |
tree | af724165971829de9394145db5dced80d6ef932b /drivers/video/pxa_lcd.c | |
parent | 16ae7827226ce8b255245d1932e8069f00997a26 (diff) | |
parent | 73b462b84568ac887ae9ad083580289175202327 (diff) | |
download | u-boot-imx-28c4dae114c9b94b2a1111d81d4da716e9fc2cba.zip u-boot-imx-28c4dae114c9b94b2a1111d81d4da716e9fc2cba.tar.gz u-boot-imx-28c4dae114c9b94b2a1111d81d4da716e9fc2cba.tar.bz2 |
Merge branch 'next' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers/video/pxa_lcd.c')
-rw-r--r-- | drivers/video/pxa_lcd.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/video/pxa_lcd.c b/drivers/video/pxa_lcd.c index e19f6ac..f66f615 100644 --- a/drivers/video/pxa_lcd.c +++ b/drivers/video/pxa_lcd.c @@ -379,21 +379,6 @@ lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue) #endif /* LCD_COLOR8 */ /*----------------------------------------------------------------------*/ -#if LCD_BPP == LCD_MONOCHROME -void lcd_initcolregs (void) -{ - struct pxafb_info *fbi = &panel_info.pxa; - cmap = (ushort *)fbi->palette; - ushort regno; - - for (regno = 0; regno < 16; regno++) { - cmap[regno * 2] = 0; - cmap[(regno * 2) + 1] = regno & 0x0f; - } -} -#endif /* LCD_MONOCHROME */ - -/*----------------------------------------------------------------------*/ __weak void lcd_enable(void) { } |