[PATCH] fix prom_init undefined error

[Geoff Levand]

Paul,

This patch fixes a build error when CONFIG_PPC_OF=n,
CONFIG_PPC_MULTIPLATFORM=y.  It makes the conditionals
consistent in arch/powerpc/kernel/Makefile and head_64.S
to both be on CONFIG_PPC_OF.

  arch/powerpc/kernel/head_64.o: In function `.__boot_from_prom':
  linux/arch/powerpc/kernel/head_64.S:(.text+0x8158): undefined reference to `.prom_init'

obj-$(CONFIG_PPC_OF) += prom_init.o


Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>

--

--- powerpc.git.orig/arch/powerpc/kernel/head_64.S	2006-02-07 13:18:14.000000000 -0800
+++ powerpc.git/arch/powerpc/kernel/head_64.S	2006-02-07 14:51:15.000000000 -0800
@@ -1515,7 +1515,7 @@
  *
  */
 _GLOBAL(__start_initialization_multiplatform)
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_OF
 	/*
 	 * Are we booted from a PROM Of-type client-interface ?
 	 */
@@ -1542,7 +1542,7 @@
 	bl	.__mmu_off
 	b	.__after_prom_start
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_OF
 _STATIC(__boot_from_prom)
 	/* Save parameters */
 	mr	r31,r3