diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-07 00:13:07 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-07 00:13:07 +0400 |
| commit | 5914f1a5bea192e57cd104635c69c19703f0a426 (patch) | |
| tree | cd76b3836598058e7004bcfe27f29cf8930de58f /arch/arm/mach-tegra | |
| parent | 8e31cbc66b4c92fd1b70cbacc4917df322345f42 (diff) | |
| parent | 95ef9958849381931a79ecec53e677e52c406c5a (diff) | |
| download | linux-5914f1a5bea192e57cd104635c69c19703f0a426.tar.xz | |
Merge branch 'for-3.6/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
From Stephen Warren <swarren@wwwdotorg.org>:
* 'for-3.6/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: tegra: build powergate unconditionally
ARM: tegra: Fix dts files w/ status property: "disable" -> "disabled"
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 2eb4445ddb14..35253fdd1ba7 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -8,9 +8,9 @@ obj-y += timer.o obj-y += fuse.o obj-y += pmc.o obj-y += flowctrl.o +obj-y += powergate.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_3x_SOC) += board-dt-tegra30.o |