From 9be71ee55e5bb5621ee56927f7021d1747063d2c Mon Sep 17 00:00:00 2001
From: Frederik Deweerdt <deweerdt@free.fr>
Date: Sun, 30 Jul 2006 03:03:46 -0700
Subject: [PATCH] --- yaml --- r: 32948 b: refs/heads/master c:
 7ca7b5c42e783b74a57387418bfcfea072fc46d6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3fc2aef33d54..16a5338a67c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9578bcf4ecaf447cb4bb0891309fad73ff5c00e3
+refs/heads/master: 7ca7b5c42e783b74a57387418bfcfea072fc46d6
diff --git a/trunk/drivers/video/console/mdacon.c b/trunk/drivers/video/console/mdacon.c
index 52ed12b12acc..eb4d03fa5391 100644
--- a/trunk/drivers/video/console/mdacon.c
+++ b/trunk/drivers/video/console/mdacon.c
@@ -197,7 +197,7 @@ static int __init mdacon_setup(char *str)
 __setup("mdacon=", mdacon_setup);
 #endif
 
-static int __init mda_detect(void)
+static int mda_detect(void)
 {
 	int count=0;
 	u16 *p, p_save;
@@ -282,7 +282,7 @@ static int __init mda_detect(void)
 	return 1;
 }
 
-static void __init mda_initialize(void)
+static void mda_initialize(void)
 {
 	write_mda_b(97, 0x00);		/* horizontal total */
 	write_mda_b(80, 0x01);		/* horizontal displayed */