diff options
| author | Colin Cross <ccross@android.com> | 2010-12-08 19:54:37 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-12-08 19:54:37 -0800 |
| commit | 42907f1736fe39cdf39b5f583fcd6b9e4e257b18 (patch) | |
| tree | 8f13b9c7990bb6f5c39b2869e6829c72153d0ee0 /arch/arm/mach-tegra/Makefile | |
| parent | 2bc50e6e810abc002ccb32e46f36d20114d0b249 (diff) | |
| parent | 85f7f645fb1c386b7b01044f2402587d9beda517 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 6de6bc4c762e..9b8bdf9f5625 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_dvfs.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_fuse.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += suspend-t2.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_save.o +obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o obj-$(CONFIG_CPU_V7) += cortex-a9.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += pinmux-t2-tables.o |