diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 11:57:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 11:57:46 -0400 |
| commit | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (patch) | |
| tree | 9d8336ee0fba2fade8b5a7d07011e74294256838 /arch/arm/kernel/Makefile | |
| parent | bda2487997c3b7828a3765e7f2c37fdd6b7bdcbe (diff) | |
| parent | 5a567d78c437e3be1c512734cdfe64b4ae6b82d7 (diff) | |
Merge branch 'depends/rmk/smp' into tmp
Diffstat (limited to 'arch/arm/kernel/Makefile')
| -rw-r--r-- | arch/arm/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index f7887dc53c1f..c687bceba7da 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile | |||
| @@ -66,6 +66,7 @@ obj-$(CONFIG_IWMMXT) += iwmmxt.o | |||
| 66 | obj-$(CONFIG_CPU_HAS_PMU) += pmu.o | 66 | obj-$(CONFIG_CPU_HAS_PMU) += pmu.o |
| 67 | obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o | 67 | obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o |
| 68 | AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt | 68 | AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt |
| 69 | obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o | ||
| 69 | 70 | ||
| 70 | ifneq ($(CONFIG_ARCH_EBSA110),y) | 71 | ifneq ($(CONFIG_ARCH_EBSA110),y) |
| 71 | obj-y += io.o | 72 | obj-y += io.o |