Commit 555cdf52 authored by Vincent Mailhol's avatar Vincent Mailhol Committed by Helge Deller
Browse files

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: default avatarVincent Mailhol <mailhol@kernel.org>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent dfa6ce63

drivers/video/console/newport_con.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static inline void newport_init_cmap(void) 


static const struct linux_logo *newport_show_logo(void)

{

#ifdef CONFIG_LOGO_SGI_CLUT224

#ifdef CONFIG_LOGO_LINUX_CLUT224

	const struct linux_logo *logo = fb_find_logo(8);

	const unsigned char *clut;

	const unsigned char *data;
@@ -127,7 +127,7 @@ static const struct linux_logo *newport_show_logo(void) 
	return logo;

#else

	return NULL;

#endif /* CONFIG_LOGO_SGI_CLUT224 */

#endif /* CONFIG_LOGO_LINUX_CLUT224 */

}



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