fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / video / logo / logo.c

diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index 77b6220..80c0361 100644 (file)
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -9,7 +9,6 @@
  *  Copyright (C) 2003 Geert Uytterhoeven <geert@linux-m68k.org>
  */
 
-#include <linux/config.h>
 #include <linux/linux_logo.h>
 #include <linux/stddef.h>
 #include <linux/module.h>
@@ -33,6 +32,7 @@ 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;
 
 
 const struct linux_logo *fb_find_logo(int depth)
@@ -96,6 +96,10 @@ const struct linux_logo *fb_find_logo(int depth)
 #ifdef CONFIG_LOGO_SUPERH_CLUT224
                /* SuperH Linux logo */
                logo = &logo_superh_clut224;
+#endif
+#ifdef CONFIG_LOGO_M32R_CLUT224
+               /* M32R Linux logo */
+               logo = &logo_m32r_clut224;
 #endif
        }
        return logo;