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

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

diff -u --recursive --new-file v2.3.26/linux/arch/ppc/kernel/setup.c linux/arch/ppc/kernel/setup.c
@@ -389,12 +389,10 @@
 
 	if ( have_of )
 	{
-#ifdef CONFIG_MACH_SPECIFIC
 		/* prom_init has already been called from __start */
 		if (boot_infos)
 			relocate_nodes();
 		finish_device_tree();
-#endif /* CONFIG_MACH_SPECIFIC	*/
 		/*
 		 * If we were booted via quik, r3 points to the physical
 		 * address of the command-line parameters.
@@ -450,7 +448,7 @@
 	int_control.int_cli = __no_use_cli;
 	int_control.int_save_flags = __no_use_save_flags;
 	int_control.int_restore_flags = __no_use_restore_flags;
-	
+
 	switch (_machine)
 	{
 	case _MACH_Pmac:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)