patch-2.3.45 linux/arch/ppc/kernel/pmac_setup.c

• Lines: 29
• Date: Sun Feb 13 10:47:01 2000
• Orig file: v2.3.44/linux/arch/ppc/kernel/pmac_setup.c
• Orig date: Thu Feb 10 17:11:05 2000

diff -u --recursive --new-file v2.3.44/linux/arch/ppc/kernel/pmac_setup.c linux/arch/ppc/kernel/pmac_setup.c
@@ -60,6 +60,7 @@
 #include <asm/machdep.h>
 #include <asm/keyboard.h>
 #include <asm/dma.h>
+#include <asm/bootx.h>
 
 #include "time.h"
 #include "local_irq.h"
@@ -440,6 +441,7 @@
 {
 	char *p;
 	int n;
+	kdev_t __init pmac_find_ide_boot(char *bootdevice, int n);
 
 	if (bootdevice == NULL)
 		return 0;
@@ -695,9 +697,12 @@
 #ifdef CONFIG_BOOTX_TEXT
 extern void drawchar(char c);
 extern void drawstring(const char *c);
+extern boot_infos_t *disp_bi;
 void
 pmac_progress(char *s, unsigned short hex)
 {
+	if (disp_bi == 0)
+		return;
 	drawstring(s);
 	drawchar('\n');
 }