Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/video/logo/logo.c

+2 −8
Original line number Diff line number Diff line
@@ -78,9 +78,6 @@ const struct linux_logo * __init_refok fb_find_logo(int depth) 
#endif

#ifdef CONFIG_LOGO_DEC_CLUT224

		/* DEC Linux logo on MIPS/MIPS64 or ALPHA */

#ifndef CONFIG_ALPHA

		if (mips_machgroup == MACH_GROUP_DEC)

#endif

		logo = &logo_dec_clut224;

#endif

#ifdef CONFIG_LOGO_MAC_CLUT224
@@ -94,9 +91,6 @@ const struct linux_logo * __init_refok fb_find_logo(int depth) 
#endif

#ifdef CONFIG_LOGO_SGI_CLUT224

		/* SGI Linux logo on MIPS/MIPS64 and VISWS */

#ifndef CONFIG_X86_VISWS

		if (mips_machgroup == MACH_GROUP_SGI)

#endif

		logo = &logo_sgi_clut224;

#endif

#ifdef CONFIG_LOGO_SUN_CLUT224