diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-09-14 13:34:53 -0400 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-09-14 13:34:53 -0400 |
| commit | f49540d1d7e90dc9864d96ad5a505d7feb8efbcc (patch) | |
| tree | 68519c0aebe74b333ee882e2b8b20583eb34fd45 /arch/arm/mach-tegra/Makefile | |
| parent | 1f10478cabacf55f87be5ed4440d07378f19c237 (diff) | |
| parent | b4350f40f73b75efdceae3d9e04266979acabd8c (diff) | |
Merge branch 'for-3.7/common-clk' into for-3.7/cleanup2
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 56065acbd816..b129f37515bb 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile | |||
| @@ -12,9 +12,11 @@ obj-y += powergate.o | |||
| 12 | obj-y += apbio.o | 12 | obj-y += apbio.o |
| 13 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o | 13 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o |
| 14 | obj-$(CONFIG_CPU_IDLE) += sleep.o | 14 | obj-$(CONFIG_CPU_IDLE) += sleep.o |
| 15 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_clocks.o | 15 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20_clocks.o |
| 16 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20_clocks_data.o | ||
| 16 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o | 17 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o |
| 17 | obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks.o | 18 | obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks.o |
| 19 | obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks_data.o | ||
| 18 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o | 20 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o |
| 19 | obj-$(CONFIG_SMP) += reset.o | 21 | obj-$(CONFIG_SMP) += reset.o |
| 20 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o | 22 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o |