aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSegher Boessenkool <segher@kernel.crashing.org>2008-05-07 08:58:50 +1000
committerPaul Mackerras <paulus@samba.org>2008-05-12 20:27:50 +1000
commit6a8b23086c82d7cc4f424518532c8b10d95715c0 (patch)
tree91f8def2cca5696e3fa01220e228129b9825ab08 /arch
parent9717e87fb19f21d1be2ac1dce8f65045547b7e1b (diff)
downloadkernel_samsung_smdk4412-6a8b23086c82d7cc4f424518532c8b10d95715c0.zip
kernel_samsung_smdk4412-6a8b23086c82d7cc4f424518532c8b10d95715c0.tar.gz
kernel_samsung_smdk4412-6a8b23086c82d7cc4f424518532c8b10d95715c0.tar.bz2
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index d14cebf..2346d27 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