diff options
Diffstat (limited to 'drivers/video/logo')
| -rw-r--r-- | drivers/video/logo/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/video/logo/Makefile | 2 | ||||
| -rw-r--r-- | drivers/video/logo/logo.c | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig index cd13de580289..aa64a1e30e31 100644 --- a/drivers/video/logo/Kconfig +++ b/drivers/video/logo/Kconfig @@ -10,6 +10,11 @@ menuconfig LOGO if LOGO +config FB_LOGO_EXTRA + bool + depends on FB=y + default y if SPU_BASE + config LOGO_LINUX_MONO bool "Standard black and white Linux logo" default y diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index 4c76e0b4ae66..7e83a640ed5f 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile @@ -17,6 +17,8 @@ obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o +obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o + # How to generate logo's # Use logo-cfiles to retrieve list of .c files to be built diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c index 6550397dd729..0aeec7724426 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c @@ -37,7 +37,11 @@ extern const struct linux_logo logo_superh_vga16; extern const struct linux_logo logo_superh_clut224; extern const struct linux_logo logo_m32r_clut224; -const struct linux_logo *fb_find_logo(int depth) +/* logo's are marked __initdata. Use __init_refok to tell + * modpost that it is intended that this function uses data + * marked __initdata. + */ +const struct linux_logo * __init_refok fb_find_logo(int depth) { const struct linux_logo *logo = NULL; |