summaryrefslogtreecommitdiffstats
path: root/drivers/video/console
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-08-22 14:02:01 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-22 19:52:47 -0700
commit4ae8aeae47e0f014ec453c4b75c9de00bd29e9e6 (patch)
treefc5f8af5c600520d9bb91fa0099bcd56c9122278 /drivers/video/console
parent0aa42632d3a0024700b25f57fd0fca56f6abad24 (diff)
newport_con warning fix
drivers/video/console/newport_con.c: In function `newport_console_init': drivers/video/console/newport_con.c:743: warning: return makes integer from pointer without a cast Although one wonders whether that should have been -ENODEV... Cc: "Antonino A. Daplas" <adaplas@pol.net> Cc: Ralf Baechle <ralf@linux-mips.org> 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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index 7fa1afeae8d..dda0586ab3f 100644
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -738,9 +738,8 @@ const struct consw newport_con = {
#ifdef MODULE
static int __init newport_console_init(void)
{
-
if (!sgi_gfxaddr)
- return NULL;
+ return 0;
if (!npregs)
npregs = (struct newport_regs *)/* ioremap cannot fail */