diff --git a/[refs] b/[refs] index f2b803df67c6..469f37b37430 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 149041070deb2e83cd36dc60bc72975b3cbf5bbe +refs/heads/master: 53da05632b96440b07615458e57d096a89cc466c diff --git a/trunk/drivers/video/console/newport_con.c b/trunk/drivers/video/console/newport_con.c index f57d7b2758b7..d31b203bf654 100644 --- a/trunk/drivers/video/console/newport_con.c +++ b/trunk/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);