Skip to content

Commit

Permalink
netport_con.c: fix build errors and warnings
Browse files Browse the repository at this point in the history
Fix build broken by accaa24:

  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: Ralf Baechle <ralf@linux-mips.org>
Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Ralf Baechle authored and Linus Torvalds committed Oct 18, 2007
1 parent 1490410 commit 53da056
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/video/console/newport_con.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit 53da056

Please sign in to comment.