patch-2.4.22 linux-2.4.22/arch/ppc/kernel/setup.c

• Lines: 112
• Date: 2003-08-25 04:44:40.000000000 -0700
• Orig file: linux-2.4.21/arch/ppc/kernel/setup.c
• Orig date: 2003-06-13 07:51:31.000000000 -0700

diff -urN linux-2.4.21/arch/ppc/kernel/setup.c linux-2.4.22/arch/ppc/kernel/setup.c
@@ -54,7 +54,7 @@
 unsigned long sysmap_size;
 
 /* Used with the BI_MEMSIZE bootinfo parameter to store the memory
-   size value reported by the boot loader. */ 
+   size value reported by the boot loader. */
 unsigned long boot_mem_size;
 
 unsigned long ISA_DMA_THRESHOLD;
@@ -89,7 +89,7 @@
 int icache_bsize;
 int ucache_bsize;
 
-#ifdef CONFIG_VGA_CONSOLE
+#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_FB)
 struct screen_info screen_info = {
 	0, 25,			/* orig-x, orig-y */
 	0,			/* unused */
@@ -101,18 +101,18 @@
 	1,			/* orig-video-isVGA */
 	16			/* orig-video-points */
 };
-#endif /* CONFIG_VGA_CONSOLE */
+#endif /* CONFIG_VGA_CONSOLE || CONFIG_FB */
 
 void machine_restart(char *cmd)
 {
 	ppc_md.restart(cmd);
 }
-  
+
 void machine_power_off(void)
 {
 	ppc_md.power_off();
 }
-  
+
 void machine_halt(void)
 {
 	ppc_md.halt();
@@ -207,7 +207,7 @@
 		break;
 	}
 
-	seq_printf(m, "revision\t: %hd.%hd (pvr %04x %04x)\n", 
+	seq_printf(m, "revision\t: %hd.%hd (pvr %04x %04x)\n",
 		   maj, min, PVR_VER(pvr), PVR_REV(pvr));
 
 	seq_printf(m, "bogomips\t: %lu.%02lu\n",
@@ -304,7 +304,7 @@
 {
 	char *model;
 	struct device_node *root;
-			
+
 	/* ask the OF info if we're a chrp or pmac */
 	root = find_path_device("/");
 	if (root != 0) {
@@ -333,7 +333,7 @@
 		btext_clearscreen();
 		btext_welcome();
 	}
-#endif	
+#endif
 
 	parse_bootinfo(find_bootinfo());
 
@@ -370,7 +370,7 @@
 	 * bootargs property of the /chosen node.
 	 * If an initial ramdisk is present, r3 and r4
 	 * are used for initrd_start and initrd_size,
-	 * otherwise they contain 0xdeadbeef.  
+	 * otherwise they contain 0xdeadbeef.
 	 */
 	if (r3 >= 0x4000 && r3 < 0x800000 && r4 == 0) {
 		cmd_line[0] = 0;
@@ -393,7 +393,7 @@
 	} else {
 		struct device_node *chosen;
 		char *p;
-			
+
 #ifdef CONFIG_BLK_DEV_INITRD
 		if (r3 && r4 && r4 != 0xdeadbeef) {
 			if (r3 < KERNELBASE)
@@ -454,7 +454,7 @@
 		ulong *data = rec->data;
 		switch (rec->tag) {
 		case BI_CMD_LINE:
-			memcpy(cmd_line, (void *)data, rec->size - 
+			memcpy(cmd_line, (void *)data, rec->size -
 					sizeof(struct bi_record));
 			break;
 		case BI_SYSMAP:
@@ -531,7 +531,7 @@
 {
 	/* clear the progress line */
 	if ( ppc_md.progress ) ppc_md.progress("             ", 0xffff);
-	
+
 	if (ppc_md.init != NULL) {
 		ppc_md.init();
 	}
@@ -596,7 +596,7 @@
 	init_mm.end_code = (unsigned long) _etext;
 	init_mm.end_data = (unsigned long) _edata;
 	init_mm.brk = (unsigned long) klimit;
-	
+
 	/* Save unparsed command line copy for /proc/cmdline */
 	strcpy(saved_command_line, cmd_line);
 	*cmdline_p = cmd_line;