summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2016-01-12 13:41:03 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2016-01-12 13:41:03 +0000
commit6660800fb7fd0f66faecb3c550fe59709220ade5 (patch)
tree19f95c0579bc13ba8c1d326e5058330e2fd14d63 /arch/arm/kernel/Makefile
parent598bcc6ea6ec4032d2ace8b1b43d11b4708af072 (diff)
parent06312f44ad638c02e26c5f187c9ee8f94cbaa3a2 (diff)
downloadlinux-6660800fb7fd0f66faecb3c550fe59709220ade5.tar.bz2
Merge branch 'devel-stable' into for-linus
Diffstat (limited to 'arch/arm/kernel/Makefile')
-rw-r--r--arch/arm/kernel/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 82bdac0f2804..f729085ece28 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -76,6 +76,7 @@ obj-$(CONFIG_HW_PERF_EVENTS) += perf_event_xscale.o perf_event_v6.o \
AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt
obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o
obj-$(CONFIG_VDSO) += vdso.o
+obj-$(CONFIG_EFI) += efi.o
ifneq ($(CONFIG_ARCH_EBSA110),y)
obj-y += io.o