patch-2.4.4 linux/arch/sh/kernel/setup.c

• Lines: 41
• Date: Fri Apr 27 14:10:32 2001
• Orig file: v2.4.3/linux/arch/sh/kernel/setup.c
• Orig date: Fri Feb 9 11:29:44 2001

diff -u --recursive --new-file v2.4.3/linux/arch/sh/kernel/setup.c linux/arch/sh/kernel/setup.c
@@ -50,17 +50,25 @@
 
 struct sh_cpuinfo boot_cpu_data = { CPU_SH_NONE, 0, 0, 0, };
 struct screen_info screen_info;
-
-#ifdef CONFIG_BLK_DEV_RAM
-extern int rd_doload;		/* 1 = load ramdisk, 0 = don't load */
-extern int rd_prompt;		/* 1 = prompt for ramdisk, 0 = don't prompt */
-extern int rd_image_start;	/* starting block # of image */
-#endif
+unsigned char aux_device_present = 0xaa;
 
 #if defined(CONFIG_SH_GENERIC) || defined(CONFIG_SH_UNKNOWN)
 struct sh_machine_vector sh_mv;
 #endif
 
+/* We need this to satisfy some external references. */
+struct screen_info screen_info = {
+        0, 25,                  /* orig-x, orig-y */
+        0,                      /* unused */
+        0,                      /* orig-video-page */
+        0,                      /* orig-video-mode */
+        80,                     /* orig-video-cols */
+        0,0,0,                  /* ega_ax, ega_bx, ega_cx */
+        25,                     /* orig-video-lines */
+        0,                      /* orig-video-isVGA */
+        16                      /* orig-video-points */
+};
+
 extern void fpu_init(void);
 extern int root_mountflags;
 extern int _text, _etext, _edata, _end;
@@ -115,7 +123,7 @@
 	{ "Kernel data", 0, 0 }
 };
 
-static unsigned long memory_start, memory_end;
+unsigned long memory_start, memory_end;
 
 #ifdef CONFIG_SH_EARLY_PRINTK
 /*