diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-12 16:29:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-12 16:29:14 -0400 |
| commit | 5aaca7a7a5db157530d195c4b93c8fc4682f8a48 (patch) | |
| tree | 1c9a2a7e898c8a460bc10d7f3c5c8308188c0072 /arch/powerpc/kernel/Makefile | |
| parent | 8c6b0ef2ea1bb42cd72d987389297f66cd25790b (diff) | |
| parent | 9404ef02974a5411687b6c1b8ef3984305620e02 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
| -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 |