summaryrefslogtreecommitdiff
path: root/drivers/video/console
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2007-10-18 03:04:29 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 14:37:17 -0700
commit53da05632b96440b07615458e57d096a89cc466c (patch)
treeeb68195d6a50a51b91330c421cfbb18fbb2480e7 /drivers/video/console
parent149041070deb2e83cd36dc60bc72975b3cbf5bbe (diff)
downloadlinux-3.10-53da05632b96440b07615458e57d096a89cc466c.tar.gz
linux-3.10-53da05632b96440b07615458e57d096a89cc466c.tar.bz2
linux-3.10-53da05632b96440b07615458e57d096a89cc466c.zip
netport_con.c: fix build errors and warnings
Fix build broken by accaa24c492f1aa3b9c37226d868dc59c3007531: 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>
Diffstat (limited to 'drivers/video/console')
-rw-r--r--drivers/video/console/newport_con.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index f57d7b2758b..d31b203bf65 100644
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -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);