diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-09 22:09:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-09 22:27:03 +0100 |
| commit | ee22524dbe4fcbaa8186296d197e73982a935565 (patch) | |
| tree | 3a30ec09b61048bdea28845126e897446c82f258 /arch/arm64/kernel/Makefile | |
| parent | 8ecd48091c61213762407f5ce02d3fa4ede66402 (diff) | |
| parent | a84034fddb11f30849dd7ce050689d615995c0d2 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-topology' into lsk-v3.10-arm64-hmp
Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/topology.h
arch/arm64/kernel/smp.c
arch/arm64/kernel/topology.c
Diffstat (limited to 'arch/arm64/kernel/Makefile')
| -rw-r--r-- | arch/arm64/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 4e4c80d11509..5a9ed500704f 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -15,6 +15,7 @@ arm64-obj-$(CONFIG_COMPAT) += sys32.o kuser32.o signal32.o \ sys_compat.o arm64-obj-$(CONFIG_MODULES) += arm64ksyms.o module.o arm64-obj-$(CONFIG_SMP) += smp.o smp_spin_table.o smp_psci.o +arm64-obj-$(CONFIG_SMP) += topology.o arm64-obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.o arm64-obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |