diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | 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 a9283bae7790..fc72684aae5a 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) | |||
78 | #endif | 78 | #endif |
79 | #ifdef CONFIG_LOGO_DEC_CLUT224 | 79 | #ifdef CONFIG_LOGO_DEC_CLUT224 |
80 | /* DEC Linux logo on MIPS/MIPS64 or ALPHA */ | 80 | /* DEC Linux logo on MIPS/MIPS64 or ALPHA */ |
81 | #ifndef CONFIG_ALPHA | 81 | logo = &logo_dec_clut224; |
82 | if (mips_machgroup == MACH_GROUP_DEC) | ||
83 | #endif | ||
84 | logo = &logo_dec_clut224; | ||
85 | #endif | 82 | #endif |
86 | #ifdef CONFIG_LOGO_MAC_CLUT224 | 83 | #ifdef CONFIG_LOGO_MAC_CLUT224 |
87 | /* Macintosh Linux logo on m68k */ | 84 | /* Macintosh Linux logo on m68k */ |
@@ -94,10 +91,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth) | |||
94 | #endif | 91 | #endif |
95 | #ifdef CONFIG_LOGO_SGI_CLUT224 | 92 | #ifdef CONFIG_LOGO_SGI_CLUT224 |
96 | /* SGI Linux logo on MIPS/MIPS64 and VISWS */ | 93 | /* SGI Linux logo on MIPS/MIPS64 and VISWS */ |
97 | #ifndef CONFIG_X86_VISWS | 94 | logo = &logo_sgi_clut224; |
98 | if (mips_machgroup == MACH_GROUP_SGI) | ||
99 | #endif | ||
100 | logo = &logo_sgi_clut224; | ||
101 | #endif | 95 | #endif |
102 | #ifdef CONFIG_LOGO_SUN_CLUT224 | 96 | #ifdef CONFIG_LOGO_SUN_CLUT224 |
103 | /* Sun Linux logo */ | 97 | /* Sun Linux logo */ |