Commit 41702d9a authored by Ralf Baechle's avatar Ralf Baechle Committed by Linus Torvalds

logo.c: get rid of mips_machgroup

This has not been any serious user of this ill conceived thing since the
original invention in like '95 so I recently deleted this from everywhere
except the last instance in logo.c.  This patch removes the last two
instances in logo.c.  They conditions were not useful anyway as when
compiled in they would always evaluate as true.

Last not least this is necessary to get the SGI IP22 and DECstation kernels
to compile again.
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c40eea98
...@@ -78,10 +78,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth) ...@@ -78,10 +78,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
#endif #endif
#ifdef CONFIG_LOGO_DEC_CLUT224 #ifdef CONFIG_LOGO_DEC_CLUT224
/* DEC Linux logo on MIPS/MIPS64 or ALPHA */ /* DEC Linux logo on MIPS/MIPS64 or ALPHA */
#ifndef CONFIG_ALPHA logo = &logo_dec_clut224;
if (mips_machgroup == MACH_GROUP_DEC)
#endif
logo = &logo_dec_clut224;
#endif #endif
#ifdef CONFIG_LOGO_MAC_CLUT224 #ifdef CONFIG_LOGO_MAC_CLUT224
/* Macintosh Linux logo on m68k */ /* Macintosh Linux logo on m68k */
...@@ -94,10 +91,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth) ...@@ -94,10 +91,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
#endif #endif
#ifdef CONFIG_LOGO_SGI_CLUT224 #ifdef CONFIG_LOGO_SGI_CLUT224
/* SGI Linux logo on MIPS/MIPS64 and VISWS */ /* SGI Linux logo on MIPS/MIPS64 and VISWS */
#ifndef CONFIG_X86_VISWS logo = &logo_sgi_clut224;
if (mips_machgroup == MACH_GROUP_SGI)
#endif
logo = &logo_sgi_clut224;
#endif #endif
#ifdef CONFIG_LOGO_SUN_CLUT224 #ifdef CONFIG_LOGO_SUN_CLUT224
/* Sun Linux logo */ /* Sun Linux logo */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment