diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 23:33:12 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 23:33:12 +0300 |
| commit | c13aca79ff3c4af5fd31a5b2743a90eba6e36a26 (patch) | |
| tree | 8f77894f61822d1ae5285c07c801af7c62f71afd /drivers/video/logo/logo.c | |
| parent | 40f7090bb1b4ec327ea1e1402ff5783af5b35195 (diff) | |
| parent | 5ca4d1ae9bad0f59bd6f851c39b19f5366953666 (diff) | |
| download | linux-c13aca79ff3c4af5fd31a5b2743a90eba6e36a26.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 4.18 merge window.
Diffstat (limited to 'drivers/video/logo/logo.c')
| -rw-r--r-- | drivers/video/logo/logo.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c index 4d50bfd13e7c..36aa050f9a21 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c @@ -63,10 +63,6 @@ const struct linux_logo * __ref fb_find_logo(int depth) /* Generic Linux logo */ logo = &logo_linux_vga16; #endif -#ifdef CONFIG_LOGO_BLACKFIN_VGA16 - /* Blackfin processor logo */ - logo = &logo_blackfin_vga16; -#endif #ifdef CONFIG_LOGO_SUPERH_VGA16 /* SuperH Linux logo */ logo = &logo_superh_vga16; @@ -78,10 +74,6 @@ const struct linux_logo * __ref fb_find_logo(int depth) /* Generic Linux logo */ logo = &logo_linux_clut224; #endif -#ifdef CONFIG_LOGO_BLACKFIN_CLUT224 - /* Blackfin Linux logo */ - logo = &logo_blackfin_clut224; -#endif #ifdef CONFIG_LOGO_DEC_CLUT224 /* DEC Linux logo on MIPS/MIPS64 or ALPHA */ logo = &logo_dec_clut224; @@ -107,10 +99,6 @@ const struct linux_logo * __ref fb_find_logo(int depth) /* SuperH Linux logo */ logo = &logo_superh_clut224; #endif -#ifdef CONFIG_LOGO_M32R_CLUT224 - /* M32R Linux logo */ - logo = &logo_m32r_clut224; -#endif } return logo; } |