Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / video / logo / logo.c

diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index 2e85a2b..840dc48 100644 (file)
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -21,21 +21,6 @@
 #include <asm/bootinfo.h>
 #endif
 
-extern const struct linux_logo logo_linux_mono;
-extern const struct linux_logo logo_linux_vga16;
-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_mac_clut224;
-extern const struct linux_logo logo_parisc_clut224;
-extern const struct linux_logo logo_sgi_clut224;
-extern const struct linux_logo logo_sun_clut224;
-extern const struct linux_logo logo_superh_mono;
-extern const struct linux_logo logo_superh_vga16;
-extern const struct linux_logo logo_superh_clut224;
-extern const struct linux_logo logo_m32r_clut224;
-
 static int nologo;
 module_param(nologo, bool, 0);
 MODULE_PARM_DESC(nologo, "Disables startup logo");
@@ -111,6 +96,10 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
                /* SuperH Linux logo */
                logo = &logo_superh_clut224;
 #endif
+#ifdef CONFIG_LOGO_PANDORA_CLUT224
+               /* Pandora Linux logo */
+               logo = &logo_pandora_clut224;
+#endif
 #ifdef CONFIG_LOGO_M32R_CLUT224
                /* M32R Linux logo */
                logo = &logo_m32r_clut224;