diff options
author | Segher Boessenkool <segher@kernel.crashing.org> | 2008-05-06 18:58:50 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-05-12 06:27:50 -0400 |
commit | 6a8b23086c82d7cc4f424518532c8b10d95715c0 (patch) | |
tree | 91f8def2cca5696e3fa01220e228129b9825ab08 /arch/powerpc | |
parent | 9717e87fb19f21d1be2ac1dce8f65045547b7e1b (diff) |
[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/powerpc')
-rw-r--r-- | arch/powerpc/kernel/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index d14cebf62bb0..2346d271fbfd 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -105,6 +105,9 @@ PHONY += systbl_chk | |||
105 | systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i | 105 | systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i |
106 | $(call cmd,systbl_chk) | 106 | $(call cmd,systbl_chk) |
107 | 107 | ||
108 | |||
109 | ifeq ($(CONFIG_PPC_MERGE),y) | ||
110 | |||
108 | $(obj)/built-in.o: prom_init_check | 111 | $(obj)/built-in.o: prom_init_check |
109 | 112 | ||
110 | quiet_cmd_prom_init_check = CALL $< | 113 | quiet_cmd_prom_init_check = CALL $< |
@@ -114,4 +117,7 @@ PHONY += prom_init_check | |||
114 | prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o | 117 | prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o |
115 | $(call cmd,prom_init_check) | 118 | $(call cmd,prom_init_check) |
116 | 119 | ||
120 | endif | ||
121 | |||
122 | |||
117 | clean-files := vmlinux.lds | 123 | clean-files := vmlinux.lds |