patch-2.3.13 linux/drivers/video/vgacon.c

• Lines: 30
• Date: Mon Aug 9 10:25:01 1999
• Orig file: v2.3.12/linux/drivers/video/vgacon.c
• Orig date: Wed Jul 21 15:46:48 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/video/vgacon.c linux/drivers/video/vgacon.c
@@ -116,7 +116,7 @@
 static unsigned int    vga_rolled_over = 0;
 
 
-void no_scroll(char *str, int *ints)
+static int __init no_scroll(char *str)
 {
 	/*
 	 * Disabling scrollback is required for the Braillex ib80-piezo
@@ -124,8 +124,11 @@
 	 * Use the "no-scroll" bootflag.
 	 */
 	vga_hardscroll_user_enable = vga_hardscroll_enabled = 0;
+	return 1;
 }
 
+__setup("no-scroll", no_scroll);
+
 /*
  * By replacing the four outb_p with two back to back outw, we can reduce
  * the window of opportunity to see text mislocated to the RHS of the
@@ -159,7 +162,7 @@
 	restore_flags(flags);
 }
 
-__initfunc(static const char *vgacon_startup(void))
+static const char __init *vgacon_startup(void)
 {
 	const char *display_desc = NULL;
 	u16 saved1, saved2;