diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
| commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
| tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /drivers/video/logo/logo.c | |
| parent | 2b2c3750330325ae5071582b5c4dbdf1c8bc1e51 (diff) | |
| parent | a92b7b80579fe68fe229892815c750f6652eb6a9 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/video/logo/logo.c')
| -rw-r--r-- | drivers/video/logo/logo.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c index 77b622075001..788fa812c871 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c | |||
| @@ -33,6 +33,7 @@ extern const struct linux_logo logo_sun_clut224; | |||
| 33 | extern const struct linux_logo logo_superh_mono; | 33 | extern const struct linux_logo logo_superh_mono; |
| 34 | extern const struct linux_logo logo_superh_vga16; | 34 | extern const struct linux_logo logo_superh_vga16; |
| 35 | extern const struct linux_logo logo_superh_clut224; | 35 | extern const struct linux_logo logo_superh_clut224; |
| 36 | extern const struct linux_logo logo_m32r_clut224; | ||
| 36 | 37 | ||
| 37 | 38 | ||
| 38 | const struct linux_logo *fb_find_logo(int depth) | 39 | const struct linux_logo *fb_find_logo(int depth) |
| @@ -97,6 +98,10 @@ const struct linux_logo *fb_find_logo(int depth) | |||
| 97 | /* SuperH Linux logo */ | 98 | /* SuperH Linux logo */ |
| 98 | logo = &logo_superh_clut224; | 99 | logo = &logo_superh_clut224; |
| 99 | #endif | 100 | #endif |
| 101 | #ifdef CONFIG_LOGO_M32R_CLUT224 | ||
| 102 | /* M32R Linux logo */ | ||
| 103 | logo = &logo_m32r_clut224; | ||
| 104 | #endif | ||
| 100 | } | 105 | } |
| 101 | return logo; | 106 | return logo; |
| 102 | } | 107 | } |