forked from Minki/linux
netport_con.c: fix build errors and warnings
Fix build broken by accaa24c49
:
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>
This commit is contained in:
parent
149041070d
commit
53da05632b
@ -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
|
#ifdef CONFIG_LOGO_SGI_CLUT224
|
||||||
const struct linux_logo *logo = fb_find_logo(8);
|
const struct linux_logo *logo = fb_find_logo(8);
|
||||||
@ -108,8 +108,8 @@ static struct linux_logo *newport_show_logo(void)
|
|||||||
|
|
||||||
if (!logo)
|
if (!logo)
|
||||||
return NULL;
|
return NULL;
|
||||||
*clut = logo->clut;
|
clut = logo->clut;
|
||||||
*data = logo->data;
|
data = logo->data;
|
||||||
|
|
||||||
for (i = 0; i < logo->clutsize; i++) {
|
for (i = 0; i < logo->clutsize; i++) {
|
||||||
newport_bfwait(npregs);
|
newport_bfwait(npregs);
|
||||||
|
Loading…
Reference in New Issue
Block a user