added FunKey boot logo the right way

Signed-off-by: Michel-FK <[email protected]>

Author: Michel-FK

drivers/video/logo/Kconfig

@@ -42,6 +42,10 @@ config LOGO_DEC_CLUT224
 	depends on MACH_DECSTATION || ALPHA
 	default y
 
+config LOGO_FUNKEY_CLUT224
+	bool "224-color FunKey Linux logo"
+	default y
+
 config LOGO_MAC_CLUT224
 	bool "224-color Macintosh Linux logo"
 	depends on MAC

drivers/video/logo/Makefile

@@ -4,12 +4,11 @@
 obj-$(CONFIG_LOGO)			+= logo.o
 obj-$(CONFIG_LOGO_LINUX_MONO)		+= logo_linux_mono.o
 obj-$(CONFIG_LOGO_LINUX_VGA16)		+= logo_linux_vga16.o
-#obj-$(CONFIG_LOGO_LINUX_CLUT224)	+= logo_linux_clut224.o
-# Ugly bypass:
-obj-$(CONFIG_LOGO_LINUX_CLUT224)	+= logo_funkey_clut224.o
+obj-$(CONFIG_LOGO_LINUX_CLUT224)	+= logo_linux_clut224.o
 obj-$(CONFIG_LOGO_BLACKFIN_CLUT224)	+= logo_blackfin_clut224.o
 obj-$(CONFIG_LOGO_BLACKFIN_VGA16)	+= logo_blackfin_vga16.o
 obj-$(CONFIG_LOGO_DEC_CLUT224)		+= logo_dec_clut224.o
+obj-$(CONFIG_LOGO_FUNKE_CLUT224)	+= logo_funkey_clut224.o
 obj-$(CONFIG_LOGO_MAC_CLUT224)		+= logo_mac_clut224.o
 obj-$(CONFIG_LOGO_PARISC_CLUT224)	+= logo_parisc_clut224.o
 obj-$(CONFIG_LOGO_SGI_CLUT224)		+= logo_sgi_clut224.o

drivers/video/logo/logo.c

@@ -36,10 +36,6 @@ static int __init fb_logo_late_init(void)
 
 late_initcall_sync(fb_logo_late_init);
 
-/* Ugly Bypass: */
-extern const struct linux_logo logo_funkey_clut224;
-#define CONFIG_LOGO_FUNKEY_CLUT224
-
 /* logo's are marked __initdata. Use __ref to tell
  * modpost that it is intended that this function uses data
  * marked __initdata.
@@ -90,6 +86,10 @@ const struct linux_logo * __ref fb_find_logo(int depth)
 		/* DEC Linux logo on MIPS/MIPS64 or ALPHA */
 		logo = &logo_dec_clut224;
 #endif
+#ifdef CONFIG_LOGO_FUNKEY_CLUT224
+		/* FunKey Linux logo */
+		logo = &logo_funkey_clut224;
+#endif
 #ifdef CONFIG_LOGO_MAC_CLUT224
 		/* Macintosh Linux logo on m68k */
 		if (MACH_IS_MAC)

include/linux/linux_logo.h

@@ -39,6 +39,7 @@ extern const struct linux_logo logo_linux_clut224;
 extern const struct linux_logo logo_blackfin_vga16;
 extern const struct linux_logo logo_blackfin_clut224;
 extern const struct linux_logo logo_dec_clut224;
+extern const struct linux_logo logo_funkey_clut224;
 extern const struct linux_logo logo_mac_clut224;
 extern const struct linux_logo logo_parisc_clut224;
 extern const struct linux_logo logo_sgi_clut224;