Skip to content

Commit 555cdf5

Browse files
vincent-mailholhdeller
authored andcommitted
newport_con: depend on LOGO_LINUX_CLUT224 instead of LOGO_SGI_CLUT224
newport_show_logo() is only activated if CONFIG_LOGO_SGI_CLUT224 is set (otherwise it is a NOP). This configuration item will be removed in an upcoming change so instead, make it depend on LOGO_LINUX_CLUT224. Signed-off-by: Vincent Mailhol <mailhol@kernel.org> Signed-off-by: Helge Deller <deller@gmx.de>
1 parent dfa6ce6 commit 555cdf5

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/video/console/newport_con.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static inline void newport_init_cmap(void)
9595

9696
static const struct linux_logo *newport_show_logo(void)
9797
{
98-
#ifdef CONFIG_LOGO_SGI_CLUT224
98+
#ifdef CONFIG_LOGO_LINUX_CLUT224
9999
const struct linux_logo *logo = fb_find_logo(8);
100100
const unsigned char *clut;
101101
const unsigned char *data;
@@ -127,7 +127,7 @@ static const struct linux_logo *newport_show_logo(void)
127127
return logo;
128128
#else
129129
return NULL;
130-
#endif /* CONFIG_LOGO_SGI_CLUT224 */
130+
#endif /* CONFIG_LOGO_LINUX_CLUT224 */
131131
}
132132

133133
static inline void newport_clear_screen(int xstart, int ystart, int xend,

0 commit comments

Comments
 (0)