diff options
| author | Andrey Panin <pazke@orbita1.ru> | 2003-04-04 04:16:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-04 04:16:13 -0800 |
| commit | dd3554568802e7cf794cc4cdba5df5a281da7995 (patch) | |
| tree | 0751c3f92051cec8dec10fc31714e335ed41560c /drivers | |
| parent | 43d569dfc1fc12dd4ff161009e1c2fb6c47952c7 (diff) | |
[PATCH] allow penguin with SGI logo for visws
Visual Workstations 320/540 are SGI products, so IMHO they can use
penguin with SGI logo as mips does :))
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/logo/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/video/logo/logo.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig index a410bbcbaae8..bdf4e4a68141 100644 --- a/drivers/video/logo/Kconfig +++ b/drivers/video/logo/Kconfig @@ -40,7 +40,7 @@ config LOGO_PARISC_CLUT224 config LOGO_SGI_CLUT224 bool "224-color SGI Linux logo" - depends on LOGO && (SGI_IP22 || SGI_IP27 || SGI_IP32) + depends on LOGO && (SGI_IP22 || SGI_IP27 || SGI_IP32 || X86_VISWS) default y config LOGO_SUN_CLUT224 diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c index cf0fb4666824..a93ad7cbfb25 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c @@ -80,8 +80,10 @@ const struct linux_logo * __init fb_find_logo(int type) logo = &logo_parisc_clut224; #endif #ifdef CONFIG_LOGO_SGI_CLUT224 - /* SGI Linux logo on MIPS/MIPS64 */ + /* SGI Linux logo on MIPS/MIPS64 ans VisWs 320/540 */ +#ifndef CONFIG_X86_VISWS if (mips_machgroup == MACH_GROUP_SGI) +#endif logo = &logo_sgi_clut224; #endif #ifdef CONFIG_LOGO_SUN_CLUT224 |