X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fvideo%2Fconsole%2Fmdacon.c;h=989e4d49e5bbea32cf2b04c3e85c815ad8e3c436;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=eb4d03fa53915612f40158a82d06f549eec4f595;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c
index eb4d03fa5..989e4d49e 100644
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
@@ -31,6 +31,7 @@
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/string.h>
 #include <linux/kd.h>
@@ -197,7 +198,7 @@ static int __init mdacon_setup(char *str)
 __setup("mdacon=", mdacon_setup);
 #endif
 
-static int mda_detect(void)
+static int __init mda_detect(void)
 {
 	int count=0;
 	u16 *p, p_save;
@@ -282,7 +283,7 @@ static int mda_detect(void)
 	return 1;
 }
 
-static void mda_initialize(void)
+static void __init mda_initialize(void)
 {
 	write_mda_b(97, 0x00);		/* horizontal total */
 	write_mda_b(80, 0x01);		/* horizontal displayed */
@@ -307,13 +308,13 @@ static void mda_initialize(void)
 	outb_p(0x00, mda_gfx_port);
 }
 
-static const char *mdacon_startup(void)
+static const char __init *mdacon_startup(void)
 {
 	mda_num_columns = 80;
 	mda_num_lines   = 25;
 
+	mda_vram_base = VGA_MAP_MEM(0xb0000);
 	mda_vram_len  = 0x01000;
-	mda_vram_base = VGA_MAP_MEM(0xb0000, mda_vram_len);
 
 	mda_index_port  = 0x3b4;
 	mda_value_port  = 0x3b5;