diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-22 05:52:32 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-22 05:53:20 -0400 |
| commit | 78ecad0183bd7e49131da2b5aa82bee017db1cf0 (patch) | |
| tree | 4059732146dd410d134fbc9eddfbb3f79ef509a5 /arch/arm/kernel/Makefile | |
| parent | f150abe1012f2fc7d444d33d651db32435038c11 (diff) | |
| parent | b382b940f821784107ca22de3455bb90e4512557 (diff) | |
Merge tag '3.10-rc2-psci-ops-11-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen into devel-stable
Pull psci_smp_ops support from Stefano Stabellini:
It contains the generic PSCI patch and the smp_init patch that we
discussed so much about. I think it would be helpful for other
people if you could create a stable branch with these patches so
that SoC devs can base their work on it.
Diffstat (limited to 'arch/arm/kernel/Makefile')
| -rw-r--r-- | arch/arm/kernel/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 00d703c49f82..f4285b5ffb05 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile | |||
| @@ -88,6 +88,9 @@ obj-$(CONFIG_DEBUG_LL) += debug.o | |||
| 88 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o | 88 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
| 89 | 89 | ||
| 90 | obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o | 90 | obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o |
| 91 | obj-$(CONFIG_ARM_PSCI) += psci.o | 91 | ifeq ($(CONFIG_ARM_PSCI),y) |
| 92 | obj-y += psci.o | ||
| 93 | obj-$(CONFIG_SMP) += psci_smp.o | ||
| 94 | endif | ||
| 92 | 95 | ||
| 93 | extra-y := $(head-y) vmlinux.lds | 96 | extra-y := $(head-y) vmlinux.lds |