Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param

[linux-2.6-omap-h63xx.git] / drivers / video / console / promcon.c

diff --git a/drivers/video/console/promcon.c b/drivers/video/console/promcon.c
index 04f42fcaac59dfae6f26a2296f897888332f8397..ae02e4eb18e7967e065e0aadc1c1fe6425fdd0ff 100644 (file)
--- a/drivers/video/console/promcon.c
+++ b/drivers/video/console/promcon.c
@@ -5,13 +5,11 @@
  * Copyright (C) 1998  Jakub Jelinek  (jj@ultra.linux.cz)
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/console.h>
@@ -109,7 +107,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 +131,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();
@@ -550,7 +548,8 @@ promcon_scroll(struct vc_data *conp, int t, int b, int dir, int count)
 }
 
 #if !(PROMCON_COLOR)
-static u8 promcon_build_attr(struct vc_data *conp, u8 _color, u8 _intensity, u8 _blink, u8 _underline, u8 _reverse)
+static u8 promcon_build_attr(struct vc_data *conp, u8 _color, u8 _intensity,
+    u8 _blink, u8 _underline, u8 _reverse, u8 _italic)
 {
        return (_reverse) ? 0xf : 0x7;
 }