patch-2.1.53 linux/arch/ppc/kernel/prom.c

Next file: linux/arch/ppc/kernel/residual.c
Previous file: linux/arch/ppc/kernel/prep_time.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.52/linux/arch/ppc/kernel/prom.c linux/arch/ppc/kernel/prom.c
@@ -16,6 +16,7 @@
 #include <linux/blk.h>
 #include <asm/prom.h>
 #include <asm/page.h>
+#include <asm/processor.h>
 
 #define getpromprop(node, name, buf, len)	\
 	((int)call_prom("getprop", 4, 1, (node), (name), (buf), (len)))
@@ -128,7 +129,7 @@
 prom_init(char *params, int unused, void (*pp)(void *))
 {
 	/* First get a handle for the stdout device */
-	if ( _machine != _MACH_Pmac ) /* prep */
+	if ( ! have_of() )
 		return;
 	prom_entry = pp;
 	prom_chosen = call_prom("finddevice", 1, 1, "/chosen");

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