From 17588758029132ad04c173b576f244bc2668b097 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Thu, 11 Jun 2009 02:12:28 +0000 Subject: [PATCH] --- yaml --- r: 151065 b: refs/heads/master c: 7719ed7ce814aa89c6af082f6773dddc93c6f237 h: refs/heads/master i: 151063: bd3f84c25a220c4df872d8aeeeacd3b37424be32 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/Makefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 09a93e8ccf95..2fe163feb545 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3240776ce290a3be4ca77bacf8b1e8d36b4a691d +refs/heads/master: 7719ed7ce814aa89c6af082f6773dddc93c6f237 diff --git a/trunk/arch/powerpc/kernel/Makefile b/trunk/arch/powerpc/kernel/Makefile index a7def5f90cad..612b0c4dc26d 100644 --- a/trunk/arch/powerpc/kernel/Makefile +++ b/trunk/arch/powerpc/kernel/Makefile @@ -125,6 +125,7 @@ PHONY += systbl_chk systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i $(call cmd,systbl_chk) +ifeq ($(CONFIG_PPC_OF_BOOT_TRAMPOLINE),y) $(obj)/built-in.o: prom_init_check quiet_cmd_prom_init_check = CALL $< @@ -133,5 +134,6 @@ quiet_cmd_prom_init_check = CALL $< 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