diff options
| author | Graeme Gregory <graeme.gregory@linaro.org> | 2013-09-06 10:26:37 +0100 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-09-06 10:26:37 +0100 |
| commit | e74f8d8bbd2d1256d0a154b596e47a157ea283d5 (patch) | |
| tree | 7677b6e9d9c4f19eed80086cca0a64b567ce83c8 /arch/arm64/kernel/Makefile | |
| parent | 8c3d931def3649410e65c8c50d535e1bbc937496 (diff) | |
| parent | 16d4c484405c1d3ca4c607332d01c9cefb903ab7 (diff) | |
Merge branch 'acpi-llct' of git://git.linaro.org/arm/acpi/acpi into leg-kernel
Conflicts:
arch/arm/kernel/setup.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 7b4b564961d4..a47c35962749 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -18,6 +18,7 @@ arm64-obj-$(CONFIG_SMP) += smp.o smp_spin_table.o smp_psci.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 +arm64-obj-$(CONFIG_ARM64_CPU_TOPOLOGY) += topology.o obj-y += $(arm64-obj-y) vdso/ obj-m += $(arm64-obj-m) |