From a947522702ed87bae562b8609524eeecee020fab Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 18 Oct 2007 03:04:37 -0700 Subject: [PATCH] --- yaml --- r: 71098 b: refs/heads/master c: 41702d9a4fffa9e25b2ad9d4af09b3013fa155e1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/logo/logo.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b7cfcee20cb0..b18531b3c0c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c40eea98cd723ac8942ed2db39c30182c0c928c7 +refs/heads/master: 41702d9a4fffa9e25b2ad9d4af09b3013fa155e1 diff --git a/trunk/drivers/video/logo/logo.c b/trunk/drivers/video/logo/logo.c index a9283bae7790..fc72684aae5a 100644 --- a/trunk/drivers/video/logo/logo.c +++ b/trunk/drivers/video/logo/logo.c @@ -78,10 +78,7 @@ 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; + logo = &logo_dec_clut224; #endif #ifdef CONFIG_LOGO_MAC_CLUT224 /* Macintosh Linux logo on m68k */ @@ -94,10 +91,7 @@ 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; + logo = &logo_sgi_clut224; #endif #ifdef CONFIG_LOGO_SUN_CLUT224 /* Sun Linux logo */