diff options
| author | Tom Cherry <tcherry@nvidia.com> | 2012-06-07 22:47:04 -0700 |
|---|---|---|
| committer | Tom Cherry <tcherry@nvidia.com> | 2012-06-07 22:47:04 -0700 |
| commit | 94596e0f2e5485acce0d6eef11799c5c35610cd5 (patch) | |
| tree | 8b53e2a7700aad78e278288f5aed6d95f514bc23 /arch/arm/mach-tegra/Makefile | |
| parent | 7ca2a5f1d750b580f5093c2c6895772b32d30f66 (diff) | |
| parent | b17f01f41b5cd2a49e48b87fb51d59c181819d89 (diff) | |
Merge remote branch 'origin/android-tegra-nv-3.1' into HEAD
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 9acb8305a175..e3e33ba02642 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -81,8 +81,12 @@ obj-y += reset.o obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o ifeq ($(CONFIG_TEGRA_AUTO_HOTPLUG),y) +ifeq ($(CONFIG_CPUQUIET_FRAMEWORK),y) +obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += cpuquiet.o +else obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += cpu-tegra3.o endif +endif obj-$(CONFIG_TEGRA_PCI) += pcie.o obj-$(CONFIG_USB_SUPPORT) += usb_phy.o ifeq ($(CONFIG_CPU_IDLE),y) |