From 76f123561256e5987d48ea319686d454d45f2f61 Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@in.ibm.com>
Date: Thu, 11 Jan 2007 01:52:44 +0100
Subject: [PATCH] --- yaml --- r: 45459 b: refs/heads/master c:
 118c0ace1b61433311ae4e067fdd32841baa7f91 h: refs/heads/master i:   45457:
 0f149f4968550bb09431489f4bd4e5cf196eeaf8   45455:
 4abdf60abaca9aebdcb519cbdfc9ce97d3876b87 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/serial/8250.c | 2 +-
 trunk/scripts/mod/modpost.c | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f500eb97572d..0dde32c12782 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e96763d6e52c22a8821466e4d01c0c995b8087be
+refs/heads/master: 118c0ace1b61433311ae4e067fdd32841baa7f91
diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c
index 51f3c739f7e1..5261f0af8b10 100644
--- a/trunk/drivers/serial/8250.c
+++ b/trunk/drivers/serial/8250.c
@@ -2296,7 +2296,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
 	local_irq_restore(flags);
 }
 
-static int serial8250_console_setup(struct console *co, char *options)
+static int __init serial8250_console_setup(struct console *co, char *options)
 {
 	struct uart_port *port;
 	int baud = 9600;
diff --git a/trunk/scripts/mod/modpost.c b/trunk/scripts/mod/modpost.c
index 15ab5d02e80a..82e019bf2dc5 100644
--- a/trunk/scripts/mod/modpost.c
+++ b/trunk/scripts/mod/modpost.c
@@ -595,6 +595,7 @@ static int secref_whitelist(const char *modname, const char *tosec,
 		"_ops",
 		"_probe",
 		"_probe_one",
+		"_console",
 		NULL
 	};