patch-2.1.110 linux/arch/arm/kernel/setup-ebsa110.c

Next file: linux/arch/arm/kernel/setup.c
Previous file: linux/arch/arm/kernel/process.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.109/linux/arch/arm/kernel/setup-ebsa110.c linux/arch/arm/kernel/setup-ebsa110.c
@@ -26,6 +26,7 @@
 #include <linux/major.h>
 #include <linux/utsname.h>
 #include <linux/init.h>
+#include <linux/console.h>
 
 #include <asm/hardware.h>
 #include <asm/pgtable.h>
@@ -58,7 +59,7 @@
 extern int root_mountflags;
 extern int _etext, _edata, _end;
 
-static char command_line[COMMAND_LINE_SIZE] = { 0, };
+static char command_line[COMMAND_LINE_SIZE] __initdata = { 0, };
        char saved_command_line[COMMAND_LINE_SIZE];
 
 #ifdef CONFIG_BLK_DEV_RAM
@@ -164,6 +165,10 @@
 	*memory_start_p = memory_start;
 	*memory_end_p = memory_end;
 	strcpy (system_utsname.machine, "sa110");
+
+#ifdef CONFIG_FB
+	conswitchp = &fb_con;
+#endif
 }
 
 int get_cpuinfo(char * buffer)

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