diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-18 06:04:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:37:17 -0400 |
commit | 53da05632b96440b07615458e57d096a89cc466c (patch) | |
tree | eb68195d6a50a51b91330c421cfbb18fbb2480e7 | |
parent | 149041070deb2e83cd36dc60bc72975b3cbf5bbe (diff) |
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>
-rw-r--r-- | drivers/video/console/newport_con.c | 6 |
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) | |||
98 | } | 98 | } |
99 | } | 99 | } |
100 | 100 | ||
101 | static struct linux_logo *newport_show_logo(void) | 101 | static const struct linux_logo *newport_show_logo(void) |
102 | { | 102 | { |
103 | #ifdef CONFIG_LOGO_SGI_CLUT224 | 103 | #ifdef CONFIG_LOGO_SGI_CLUT224 |
104 | const struct linux_logo *logo = fb_find_logo(8); | 104 | const struct linux_logo *logo = fb_find_logo(8); |
@@ -108,8 +108,8 @@ static struct linux_logo *newport_show_logo(void) | |||
108 | 108 | ||
109 | if (!logo) | 109 | if (!logo) |
110 | return NULL; | 110 | return NULL; |
111 | *clut = logo->clut; | 111 | clut = logo->clut; |
112 | *data = logo->data; | 112 | data = logo->data; |
113 | 113 | ||
114 | for (i = 0; i < logo->clutsize; i++) { | 114 | for (i = 0; i < logo->clutsize; i++) { |
115 | newport_bfwait(npregs); | 115 | newport_bfwait(npregs); |