Merge tag 'lsk-v3.10-android-15.01'

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

diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 65160d5fe850c7507cdd98a756482b7e52fa1dfa..f2aea1155f84fe35f3cbe8de42a38ebc3e140d77 100644 (file)
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -87,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