diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-26 14:42:51 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-26 14:42:51 -0800 |
| commit | 9335e9199bd059fc4f5e4e6fcfb9fca1d482e460 (patch) | |
| tree | 7d87fea7f24f3f1d8c2db40bcb8b249c65cf7f9e /arch/arm/mach-tegra/Makefile | |
| parent | 6b21d18ed50c7d145220b0724ea7f2613abf0f95 (diff) | |
| parent | e186ad74c0941f5caeda28bde76dab903b342c1c (diff) | |
Merge branch 'for-3.4/soc' into for-3.4/t30-smp
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index e120ff54f66..fc4ebe35f48 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -7,12 +7,15 @@ obj-y += clock.o obj-y += timer.o obj-y += pinmux.o obj-y += fuse.o +obj-$(CONFIG_CPU_IDLE) += cpuidle.o +obj-$(CONFIG_CPU_IDLE) += sleep.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += powergate.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_clocks.o 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_ARCH_TEGRA_3x_SOC) += tegra30_clocks.o obj-$(CONFIG_SMP) += platsmp.o localtimer.o headsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o |