aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/memory/tegra/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-05-13 17:59:35 +0200
committerArnd Bergmann <arnd@arndb.de>2015-05-13 17:59:35 +0200
commit44fb3026ad28d2a2b935dc9c47ec2dffadca3f35 (patch)
tree9235a53f17b59c883bee7be16ab35cf816ce6ece /drivers/memory/tegra/Makefile
parentMerge tag 'tegra-for-4.2-ramcode' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers (diff)
parentmemory: tegra: Add EMC frequency debugfs entry (diff)
downloadlinux-dev-44fb3026ad28d2a2b935dc9c47ec2dffadca3f35.tar.xz
linux-dev-44fb3026ad28d2a2b935dc9c47ec2dffadca3f35.zip
Merge tag 'tegra-for-4.2-emc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers
Merge "ARM: tegra: Add EMC driver for v4.2-rc1" from Thierry Reding: This introduces the EMC driver that's required to scale the external memory frequency. * tag 'tegra-for-4.2-emc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: memory: tegra: Add EMC frequency debugfs entry memory: tegra: Add EMC (external memory controller) driver memory: tegra: Add API needed by the EMC driver of: Add Tegra124 EMC bindings of: Document timings subnode of nvidia,tegra-mc
Diffstat (limited to 'drivers/memory/tegra/Makefile')
-rw-r--r--drivers/memory/tegra/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/memory/tegra/Makefile b/drivers/memory/tegra/Makefile
index 9d4f4319b527..6a0b9ac54f05 100644
--- a/drivers/memory/tegra/Makefile
+++ b/drivers/memory/tegra/Makefile
@@ -6,3 +6,5 @@ tegra-mc-$(CONFIG_ARCH_TEGRA_124_SOC) += tegra124.o
tegra-mc-$(CONFIG_ARCH_TEGRA_132_SOC) += tegra124.o
obj-$(CONFIG_TEGRA_MC) += tegra-mc.o
+
+obj-$(CONFIG_TEGRA124_EMC) += tegra124-emc.o