From ddd3bad0d6c5f17bb5fb5b0e6c637c978367da5c Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 2 Mar 2012 15:58:32 -0500 Subject: [PATCH] --- yaml --- r: 295663 b: refs/heads/master c: 249c5172e80acd211025da2e2cc1bd026b0ab8d4 h: refs/heads/master i: 295661: 8f298408845af0c6441915a7b96610bd04c7b8d5 295659: 683e5af688b63284768005231a237e15390e90fe 295655: 5faa99eed069f1445623c3ff3f95bfb2c0e156ce 295647: 5f1c534ab7bcbcd34341754760d90868842d2bf3 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6f17f94b5586..f0b868a56319 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 013df38857a6272c7e6bd99d3f298599a215e988 +refs/heads/master: 249c5172e80acd211025da2e2cc1bd026b0ab8d4 diff --git a/trunk/arch/arm/mach-tegra/Makefile b/trunk/arch/arm/mach-tegra/Makefile index e120ff54f663..829066fdc2ad 100644 --- a/trunk/arch/arm/mach-tegra/Makefile +++ b/trunk/arch/arm/mach-tegra/Makefile @@ -13,7 +13,8 @@ obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += pinmux-tegra20-tables.o obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += pinmux-tegra30-tables.o obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.o -obj-$(CONFIG_SMP) += platsmp.o localtimer.o headsmp.o +obj-$(CONFIG_SMP) += platsmp.o headsmp.o +obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o