summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2014-12-22 05:14:24 +0100
committerMichael Ellerman <mpe@ellerman.id.au>2015-01-28 05:00:24 +0100
commit564ec2f2a06ffd23b9f99a4a2bd3af1fc79774f4 (patch)
tree3030646c4b1bb9eef69e48a3c63438a64691d517
parentpowerpc/mm: fix undefined reference to `.__kernel_map_pages' on FSL PPC64 (diff)
downloadlinux-564ec2f2a06ffd23b9f99a4a2bd3af1fc79774f4.tar.xz
linux-564ec2f2a06ffd23b9f99a4a2bd3af1fc79774f4.zip
powerpc/lib: Makefile, consolidate obj-y sections
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/lib/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 5526156aae5f..31e1b34c0722 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -9,8 +9,9 @@ ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC)
CFLAGS_REMOVE_code-patching.o = -pg
CFLAGS_REMOVE_feature-fixups.o = -pg
-obj-y := string.o alloc.o \
- crtsavres.o ppc_ksyms.o
+obj-y += string.o alloc.o crtsavres.o ppc_ksyms.o code-patching.o \
+ feature-fixups.o
+
obj-$(CONFIG_PPC32) += div64.o copy_32.o
obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \
@@ -33,8 +34,6 @@ endif
obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
-obj-y += code-patching.o
-obj-y += feature-fixups.o
obj-$(CONFIG_FTR_FIXUP_SELFTEST) += feature-fixups-test.o
obj-$(CONFIG_ALTIVEC) += xor_vmx.o