From: Segher Boessenkool <segher@kernel.crashing.org>
Date: Tue, 6 May 2008 22:58:50 +0000 (+1000)
Subject: [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds
X-Git-Tag: v2.6.26-rc3~133^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6a8b23086c82d7cc4f424518532c8b10d95715c0;p=linux-2.6-omap-h63xx.git

[POWERPC] ppc: Don't run prom_init_check for arch/ppc builds

arch/ppc doesn't have prom_init.o (anymore).

Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index d14cebf62bb..2346d271fbf 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -105,6 +105,9 @@ PHONY += systbl_chk
 systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i
 	$(call cmd,systbl_chk)
 
+
+ifeq ($(CONFIG_PPC_MERGE),y)
+
 $(obj)/built-in.o:		prom_init_check
 
 quiet_cmd_prom_init_check = CALL    $<
@@ -114,4 +117,7 @@ PHONY += prom_init_check
 prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o
 	$(call cmd,prom_init_check)
 
+endif
+
+
 clean-files := vmlinux.lds