patch-2.4.0-test12 linux/drivers/video/mdacon.c

• Lines: 59
• Date: Mon Dec 11 13:47:20 2000
• Orig file: v2.4.0-test11/linux/drivers/video/mdacon.c
• Orig date: Tue Oct 31 12:42:27 2000

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/video/mdacon.c linux/drivers/video/mdacon.c
@@ -77,10 +77,8 @@
 
 static struct vc_data	*mda_display_fg = NULL;
 
-#ifdef MODULE_PARM
 MODULE_PARM(mda_first_vc, "1-255i");
 MODULE_PARM(mda_last_vc,  "1-255i");
-#endif
 
 /* MDA register values
  */
@@ -200,11 +198,7 @@
 }
 #endif
 
-#ifdef MODULE
-static int mda_detect(void)
-#else
 static int __init mda_detect(void)
-#endif
 {
 	int count=0;
 	u16 *p, p_save;
@@ -287,11 +281,7 @@
 	return 1;
 }
 
-#ifdef MODULE
-static void mda_initialize(void)
-#else
 static void __init mda_initialize(void)
-#endif
 {
 	write_mda_b(97, 0x00);		/* horizontal total */
 	write_mda_b(80, 0x01);		/* horizontal displayed */
@@ -316,11 +306,7 @@
 	outb_p(0x00, mda_gfx_port);
 }
 
-#ifdef MODULE
-static const char *mdacon_startup(void)
-#else
 static const char __init *mdacon_startup(void)
-#endif
 {
 	mda_num_columns = 80;
 	mda_num_lines   = 25;
@@ -605,11 +591,7 @@
 	con_invert_region:	mdacon_invert_region,
 };
 
-#ifdef MODULE
-void mda_console_init(void)
-#else
 void __init mda_console_init(void)
-#endif
 {
 	if (mda_first_vc > mda_last_vc)
 		return;