diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:08:54 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:08:54 +0800 |
| commit | efab1adba28d9ebbfa86808375fc085c4e84e746 (patch) | |
| tree | c82080ef077c5ea9e50a8308404c599710d6301f /arch/arm/kernel/Makefile | |
| parent | 039b7fca24dba50c09e60b23494ba3c4d19aac7d (diff) | |
| parent | eb7d99ea962fa62f487246462a2777ac918c8895 (diff) | |
Merge remote-tracking branch 'v4.1/topic/PSCI' into linux-linaro-lsk-v4.1lsk-v4.1-16.01
Diffstat (limited to 'arch/arm/kernel/Makefile')
| -rw-r--r-- | arch/arm/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 752725dcbf42..2c06383f4d47 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -86,7 +86,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 |