summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2006-06-26 00:27:16 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 09:58:34 -0700
commit2aea875da2b7e403b13dd05a9dc80665f39d85e4 (patch)
treeb6010aa75bf21454fe1c12c3d3e494c9ce47300c /drivers/video
parente86bb8acc0fdca82d22d12d46ef5482ecc408b26 (diff)
downloadop-kernel-dev-2aea875da2b7e403b13dd05a9dc80665f39d85e4.zip
op-kernel-dev-2aea875da2b7e403b13dd05a9dc80665f39d85e4.tar.gz
[PATCH] VT binding: Make promcon support binding
Do not mark promcon_startup() and promcon_init_unimap() as __init Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/console/promcon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/console/promcon.c b/drivers/video/console/promcon.c
index 04f42fc..d6e6ad5 100644
--- a/drivers/video/console/promcon.c
+++ b/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();
OpenPOWER on IntegriCloud