diff options
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
-rw-r--r-- | arch/powerpc/kernel/Makefile | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 1a4094704b1f..64f5948ebc9d 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -59,8 +59,6 @@ obj64-$(CONFIG_HIBERNATION) += swsusp_asm64.o | |||
59 | obj-$(CONFIG_MODULES) += module.o module_$(CONFIG_WORD_SIZE).o | 59 | obj-$(CONFIG_MODULES) += module.o module_$(CONFIG_WORD_SIZE).o |
60 | obj-$(CONFIG_44x) += cpu_setup_44x.o | 60 | obj-$(CONFIG_44x) += cpu_setup_44x.o |
61 | 61 | ||
62 | ifeq ($(CONFIG_PPC_MERGE),y) | ||
63 | |||
64 | extra-$(CONFIG_PPC_STD_MMU) := head_32.o | 62 | extra-$(CONFIG_PPC_STD_MMU) := head_32.o |
65 | extra-$(CONFIG_PPC64) := head_64.o | 63 | extra-$(CONFIG_PPC64) := head_64.o |
66 | extra-$(CONFIG_40x) := head_40x.o | 64 | extra-$(CONFIG_40x) := head_40x.o |
@@ -100,12 +98,6 @@ ifneq ($(CONFIG_PPC_INDIRECT_IO),y) | |||
100 | obj-y += iomap.o | 98 | obj-y += iomap.o |
101 | endif | 99 | endif |
102 | 100 | ||
103 | else | ||
104 | # stuff used from here for ARCH=ppc | ||
105 | smpobj-$(CONFIG_SMP) += smp.o | ||
106 | |||
107 | endif | ||
108 | |||
109 | obj-$(CONFIG_PPC64) += $(obj64-y) | 101 | obj-$(CONFIG_PPC64) += $(obj64-y) |
110 | 102 | ||
111 | extra-$(CONFIG_PPC_FPU) += fpu.o | 103 | extra-$(CONFIG_PPC_FPU) += fpu.o |
@@ -121,9 +113,6 @@ PHONY += systbl_chk | |||
121 | systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i | 113 | systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i |
122 | $(call cmd,systbl_chk) | 114 | $(call cmd,systbl_chk) |
123 | 115 | ||
124 | |||
125 | ifeq ($(CONFIG_PPC_MERGE),y) | ||
126 | |||
127 | $(obj)/built-in.o: prom_init_check | 116 | $(obj)/built-in.o: prom_init_check |
128 | 117 | ||
129 | quiet_cmd_prom_init_check = CALL $< | 118 | quiet_cmd_prom_init_check = CALL $< |
@@ -133,7 +122,4 @@ PHONY += prom_init_check | |||
133 | prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o | 122 | prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o |
134 | $(call cmd,prom_init_check) | 123 | $(call cmd,prom_init_check) |
135 | 124 | ||
136 | endif | ||
137 | |||
138 | |||
139 | clean-files := vmlinux.lds | 125 | clean-files := vmlinux.lds |