patch-2.1.109 linux/arch/alpha/kernel/setup.c

Next file: linux/arch/arm/config.in
Previous file: linux/arch/alpha/kernel/alpha_ksyms.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.108/linux/arch/alpha/kernel/setup.c linux/arch/alpha/kernel/setup.c
@@ -90,7 +90,7 @@
 	16			/* orig-video-points */
 #else
 	0, 25,			/* orig-x, orig-y */
-	{ 0, 0 },		/* unused */
+	0,	 		/* unused */
 	0,			/* orig-video-page */
 	0,			/* orig-video-mode */
 	80,			/* orig-video-cols */
@@ -223,12 +223,12 @@
 	setup_smp();
 #endif
 
-#ifdef CONFIG_VGA_CONSOLE
+#ifdef CONFIG_VT
+#if defined(CONFIG_VGA_CONSOLE)
 	conswitchp = &vga_con;
+#elif defined(CONFIG_DUMMY_CONSOLE)
+	conswitchp = &dummy_con;
 #endif
-#ifdef CONFIG_FB
-	/* Frame buffer device based console */
-	conswitchp = &fb_con;
 #endif
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov