From f1520bc1bbb5e2020c8fdb1f0db2f6b17f6806b9 Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: Mon, 26 Jun 2006 00:27:16 -0700
Subject: [PATCH] --- yaml --- r: 30331 b: refs/heads/master c:
 2aea875da2b7e403b13dd05a9dc80665f39d85e4 h: refs/heads/master i:   30329:
 04ce85bb307c275c07f65700d9a982e5c9fd2a33   30327:
 354289f807bf08175ebce50cf90f490c92933191 v: v3

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

diff --git a/[refs] b/[refs]
index 58079025e070..8ff8c20282da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e86bb8acc0fdca82d22d12d46ef5482ecc408b26
+refs/heads/master: 2aea875da2b7e403b13dd05a9dc80665f39d85e4
diff --git a/trunk/drivers/video/console/promcon.c b/trunk/drivers/video/console/promcon.c
index 04f42fcaac59..d6e6ad537f9f 100644
--- a/trunk/drivers/video/console/promcon.c
+++ b/trunk/drivers/video/console/promcon.c
@@ -109,7 +109,7 @@ promcon_end(struct vc_data *conp, char *b)
 	return b - p;
 }
 
-const char __init *promcon_startup(void)
+const char *promcon_startup(void)
 {
 	const char *display_desc = "PROM";
 	int node;
@@ -133,7 +133,7 @@ const char __init *promcon_startup(void)
 	return display_desc;
 }
 
-static void __init 
+static void
 promcon_init_unimap(struct vc_data *conp)
 {
 	mm_segment_t old_fs = get_fs();