]> err.no Git - linux-2.6/commitdiff
netport_con.c: fix build errors and warnings
authorRalf Baechle <ralf@linux-mips.org>
Thu, 18 Oct 2007 10:04:29 +0000 (03:04 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 18 Oct 2007 21:37:17 +0000 (14:37 -0700)
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>
drivers/video/console/newport_con.c

index f57d7b2758b7985686192820ed1fc47d2e857bda..d31b203bf6549bdb94b337e9f28f7265d8b544e4 100644 (file)
@@ -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);