Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53da0563 authored by Ralf Baechle's avatar Ralf Baechle Committed by Linus Torvalds
Browse files

netport_con.c: fix build errors and warnings 



Fix build broken by accaa24c:

  CC      drivers/video/console/newport_con.o
drivers/video/console/newport_con.c: In function 'newport_show_logo':
drivers/video/console/newport_con.c:111: error: assignment of read-only location
drivers/video/console/newport_con.c:111: warning: assignment makes integer from pointer without a cast
drivers/video/console/newport_con.c:112: error: assignment of read-only location
drivers/video/console/newport_con.c:112: warning: assignment makes integer from pointer without a cast

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 14904107

drivers/video/console/newport_con.c

+3 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static inline void newport_init_cmap(void) 
	}

}



static struct linux_logo *newport_show_logo(void)

static const struct linux_logo *newport_show_logo(void)

{

#ifdef CONFIG_LOGO_SGI_CLUT224

	const struct linux_logo *logo = fb_find_logo(8);
@@ -108,8 +108,8 @@ static struct linux_logo *newport_show_logo(void) 


	if (!logo)

		return NULL;

	*clut = logo->clut;

	*data = logo->data;

	clut = logo->clut;

	data = logo->data;



	for (i = 0; i < logo->clutsize; i++) {

		newport_bfwait(npregs);