karo: cleanup after merge of v2015.10-rc2

[karo-tx-uboot.git] / drivers / video / atmel_hlcdfb.c

diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index d8496f20cb7afb921874b58d3d944f429afa66ab..30c8ccb3a5bf2a33aa6fd97e6dc7c3589cfca29b 100644 (file)
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -50,15 +50,6 @@ ushort *configuration_get_cmap(void)
 #endif
 }
 
-ushort *configuration_get_cmap(void)
-{
-#if defined(CONFIG_LCD_LOGO)
-       return bmp_logo_palette;
-#else
-       return NULL;
-#endif
-}
-
 void lcd_ctrl_init(void *lcdbase)
 {
        unsigned long value;