diff options
Diffstat (limited to 'drivers/video/logo')
| -rw-r--r-- | drivers/video/logo/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/video/logo/Makefile | 2 | ||||
| -rw-r--r-- | drivers/video/logo/logo.c | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig index 6d6f8c08792d..d8e3a0c7c653 100644 --- a/drivers/video/logo/Kconfig +++ b/drivers/video/logo/Kconfig @@ -68,4 +68,8 @@ config LOGO_SUPERH_CLUT224 depends on SUPERH default y +config LOGO_CUSTOM_CLUT224 + bool "Custom 224-color Linux logo" + default n + endif # LOGO diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index 16f60c1e1766..4aba1b9e3106 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile @@ -16,6 +16,8 @@ obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o +obj-$(CONFIG_LOGO_CUSTOM_CLUT224) += logo_custom_clut224.o + # How to generate logo's pnmtologo := scripts/pnmtologo diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c index 141f15a9a459..ec3f00502a96 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c @@ -100,6 +100,10 @@ const struct linux_logo * __ref fb_find_logo(int depth) /* SuperH Linux logo */ logo = &logo_superh_clut224; #endif +#ifdef CONFIG_LOGO_CUSTOM_CLUT224 + /* Custom Linux logo */ + logo = &logo_custom_clut224; +#endif } return logo; } |