diff options
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 3 | ||||
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index 8a80eaf9278..49c06ba4cec 100644 --- a/arch/arm/configs/omap3_h1_defconfig +++ b/arch/arm/configs/omap3_h1_defconfig @@ -1815,7 +1815,8 @@ CONFIG_PANEL_ILI_9342=y # CONFIG_EXYNOS_VIDEO is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # CONFIG_ADF is not set -# CONFIG_LOGO is not set +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_FB_SSD1307 is not set CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 18a9429d686..13733c8bb1b 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -2653,6 +2653,15 @@ static int omapfb_probe(struct platform_device *pdev) goto cleanup; } +#ifdef CONFIG_LOGO + for (i = 0; i < fbdev->num_fbs; i++) { + struct fb_info *fbi = fbdev->fbs[i]; + if (fbi && fb_prepare_logo(fbi, 0)) { + fb_show_logo(fbi, 0); + } +} +#endif + return 0; cleanup: |