diff options
author | Olof Johansson | 2012-03-28 02:19:15 +0200 |
---|---|---|
committer | Olof Johansson | 2012-03-28 02:19:15 +0200 |
commit | b521d929b330d665cb3a42b26eaaa5690dc9dad7 (patch) | |
tree | 7c1ddf1c06922c4728b6625fb10cf11de5a29387 /arch/arm/mach-tegra/Makefile | |
parent | Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux i... (diff) | |
parent | Merge tag 'tegra-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/t... (diff) | |
download | kernel-qcow2-linux-b521d929b330d665cb3a42b26eaaa5690dc9dad7.tar.gz kernel-qcow2-linux-b521d929b330d665cb3a42b26eaaa5690dc9dad7.tar.xz kernel-qcow2-linux-b521d929b330d665cb3a42b26eaaa5690dc9dad7.zip |
Merge branch 'tegra/soc' into next/cleanup2
Conflicts:
arch/arm/mach-tegra/Makefile
Signed-off-by: Olof Johansson <olof@lixom.net>
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 829066fdc2ad..7517efbcf927 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 headsmp.o obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o |