patch-2.1.115 linux/arch/sparc/prom/misc.c

• Lines: 38
• Date: Tue Aug 4 16:03:35 1998
• Orig file: v2.1.114/linux/arch/sparc/prom/misc.c
• Orig date: Thu Apr 23 20:21:31 1998

diff -u --recursive --new-file v2.1.114/linux/arch/sparc/prom/misc.c linux/arch/sparc/prom/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.16 1998/03/09 14:04:25 jj Exp $
+/* $Id: misc.c,v 1.17 1998/07/21 10:36:22 jj Exp $
  * misc.c:  Miscellaneous prom functions that don't belong
  *          anywhere else.
  *
@@ -45,8 +45,7 @@
 
 /* We want to do this more nicely some day. */
 #ifdef CONFIG_SUN_CONSOLE
-extern void console_restore_palette(void);
-extern void set_palette(void);
+extern void (*prom_palette)(int);
 extern int serial_console;
 #endif
 
@@ -63,8 +62,8 @@
     
 	kernel_enter_debugger();
 #ifdef CONFIG_SUN_CONSOLE
-	if(!serial_console)
-		console_restore_palette ();
+	if(!serial_console && prom_palette)
+		prom_palette (1);
 #endif
 	install_obp_ticker();
 	save_flags(flags); cli();
@@ -76,8 +75,8 @@
 	TURN_ON_LED;
 #endif
 #ifdef CONFIG_SUN_CONSOLE
-	if(!serial_console)
-		set_palette ();
+	if(!serial_console && prom_palette)
+		prom_palette (0);
 #endif
 }