Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=41702d9a4fffa9e25b2ad9d4af09b3013fa155e1
Commit:     41702d9a4fffa9e25b2ad9d4af09b3013fa155e1
Parent:     c40eea98cd723ac8942ed2db39c30182c0c928c7
Author:     Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 18 03:04:37 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Oct 18 14:37:17 2007 -0700

    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: Ralf Baechle <[EMAIL PROTECTED]>
    Cc: "Antonino A. Daplas" <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/video/logo/logo.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index a9283ba..fc72684 100644
--- a/drivers/video/logo/logo.c
+++ b/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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to