patch-1.3.40 linux/drivers/char/vga.c

Next file: linux/drivers/net/Config.in
Previous file: linux/drivers/char/keyboard.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.39/linux/drivers/char/vga.c linux/drivers/char/vga.c
@@ -144,14 +144,14 @@
 		{
 			video_type = VIDEO_TYPE_EGAM;
 			video_mem_term = 0xb8000;
-			display_desc = "EGA+";
+			strcpy(display_desc, "EGA+");
 			request_region(0x3b0,16,"ega");
 		}
 		else
 		{
 			video_type = VIDEO_TYPE_MDA;
 			video_mem_term = 0xb2000;
-			display_desc = "*MDA";
+			strcpy(display_desc, "*MDA");
 			request_region(0x3b0,12,"mda");
 			request_region(0x3bf, 1,"mda");
 		}
@@ -170,11 +170,11 @@
 
 			if (!ORIG_VIDEO_ISVGA) {
 				video_type = VIDEO_TYPE_EGAC;
-				display_desc = "EGA";
+				strcpy(display_desc, "EGA");
 				request_region(0x3c0,32,"ega");
 			} else {
 				video_type = VIDEO_TYPE_VGAC;
-				display_desc = "VGA+";
+				strcpy(display_desc, "VGA+");
 				request_region(0x3c0,32,"vga+");
 
 #ifdef VGA_CAN_DO_64KB
@@ -215,7 +215,7 @@
 		{
 			video_type = VIDEO_TYPE_CGA;
 			video_mem_term = 0xba000;
-			display_desc = "*CGA";
+			strcpy(display_desc, "*CGA");
 			request_region(0x3d4,2,"cga");
 		}
 	}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this