summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-08-07 19:58:48 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-08-10 15:57:44 +0100
commit81497953e37bc28209d9a647171ea93b4a99fc57 (patch)
tree78ed19754c29edd182e3d1e0850eb79cce490f63 /arch/arm/kernel/Makefile
parentfa8ad7889d83bcf0a6cdbf6d3622f3ec019cde14 (diff)
parentbe120397e7709d9d5ed88317a385ce864a2603bc (diff)
downloadlinux-81497953e37bc28209d9a647171ea93b4a99fc57.tar.bz2
Merge branch 'psci/for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into devel-stable
Diffstat (limited to 'arch/arm/kernel/Makefile')
-rw-r--r--arch/arm/kernel/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index fcb25c1c5c21..af9e59bf3831 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -88,7 +88,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o
ifeq ($(CONFIG_ARM_PSCI),y)
-obj-y += psci.o psci-call.o
+obj-y += psci-call.o
obj-$(CONFIG_SMP) += psci_smp.o
endif