From 6bf20b91584649e75642a50531c452cfa40c280f Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 22 Aug 2007 14:02:01 -0700
Subject: [PATCH] --- yaml --- r: 64269 b: refs/heads/master c:
 4ae8aeae47e0f014ec453c4b75c9de00bd29e9e6 h: refs/heads/master i:   64267:
 7f8fba42161f7d469ebb9ab6e8054b13886180ed v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/video/console/newport_con.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1969c9b6e803..e4a6a59f5069 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0aa42632d3a0024700b25f57fd0fca56f6abad24
+refs/heads/master: 4ae8aeae47e0f014ec453c4b75c9de00bd29e9e6
diff --git a/trunk/drivers/video/console/newport_con.c b/trunk/drivers/video/console/newport_con.c
index 7fa1afeae8dc..dda0586ab3f3 100644
--- a/trunk/drivers/video/console/newport_con.c
+++ b/trunk/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 */