Merge branch 'rk_develop-3.10' into rk_develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / kernel / Makefile

diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index aa775438388cf0f9684ab8501a2b2c93412ba34c..f2aea1155f84fe35f3cbe8de42a38ebc3e140d77 100644 (file)
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -24,7 +24,6 @@ obj-$(CONFIG_ATAGS)           += atags_parse.o
 obj-$(CONFIG_ATAGS_PROC)       += atags_proc.o
 obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o
 
-obj-$(CONFIG_OC_ETM)           += etm.o
 obj-$(CONFIG_CPU_IDLE)         += cpuidle.o
 obj-$(CONFIG_ISA_DMA_API)      += dma.o
 obj-$(CONFIG_FIQ)              += fiq.o fiqasm.o
@@ -88,4 +87,6 @@ obj-y                         += psci.o
 obj-$(CONFIG_SMP)              += psci_smp.o
 endif
 
-extra-y := $(head-y) vmlinux.lds
+obj-$(CONFIG_PIE)              += pie.o
+
+extra-y := $(head-y) vmlinux.lds pie.lds