summaryrefslogtreecommitdiff
path: root/drivers/video/console/sticon.c
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-06-30 00:01:54 +0400
committerDave Jones <davej@redhat.com>2006-06-30 00:01:54 +0400
commit55b4d6a52195a8f277ffddf755ddaff359878f41 (patch)
tree06a3183a562f8da4688f65023f7a18dcad702956 /drivers/video/console/sticon.c
parentadf8a287150667feb5747f8beade62acacc17d4e (diff)
parent1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff)
downloadlinux-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz
Merge ../linus
Conflicts: drivers/char/agp/Kconfig
Diffstat (limited to 'drivers/video/console/sticon.c')
-rw-r--r--drivers/video/console/sticon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index fd5940f41271..45c4f227e56e 100644
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -75,7 +75,7 @@ static inline void cursor_undrawn(void)
cursor_drawn = 0;
}
-static const char *__init sticon_startup(void)
+static const char *sticon_startup(void)
{
return "STI console";
}